Changeset 4161 for trunk/LMDZ.MARS/util/zrecast.F90

Timestamp:

Apr 1, 2026, 3:17:47 PM (3 days ago)

Author:

jmauxion

Message:

Mars PCM:

• Fix improvedclouds_mod by adding a missing "else" condition on zdq.
• Add the possibility to output watercaptag in physiq_mod.
• Fix write_output to handle logical arrays with an unstructured grid.
• Update some of the utils (localtime/zrecast) to handle phisfi.

JM

File:

• trunk/LMDZ.MARS/util/zrecast.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/util/zrecast.F90

@@ -654 +654 @@
 if (ierr.ne.NF_NOERR) then
   write(*,*) "Warning: Failed to get phisinit ID from file ",trim(infile)
-  infile2="diagfi.nc"
-  write(*,*) "         Trying file ",trim(infile2)
-  ierr=NF_OPEN(infile2,NF_NOWRITE,infid2)
+  write(*,*) "Trying name phisfi (xios name)..."
+  ierr=NF_INQ_VARID(infid,"phisfi",tmpvarid)
   if (ierr.ne.NF_NOERR) then
-    write(*,*) "Problem: Could not find/open that file"
-    infile2="diagfi1.nc"
+    write(*,*) "Failed to find phisfi..."
+    infile2="diagfi.nc"
     write(*,*) "         Trying file ",trim(infile2)
     ierr=NF_OPEN(infile2,NF_NOWRITE,infid2)
     if (ierr.ne.NF_NOERR) then
       write(*,*) "Problem: Could not find/open that file"
-      infile2="phisinit.nc"
+      infile2="diagfi1.nc"
       write(*,*) "         Trying file ",trim(infile2)
       ierr=NF_OPEN(infile2,NF_NOWRITE,infid2)
       if (ierr.ne.NF_NOERR) then
-        write(*,*) "Error: Could not open that file either"
-        write(*,*) "Might as well stop here"
-        stop
+        write(*,*) "Problem: Could not find/open that file"
+        infile2="phisinit.nc"
+        write(*,*) "         Trying file ",trim(infile2)
+        ierr=NF_OPEN(infile2,NF_NOWRITE,infid2)
+        if (ierr.ne.NF_NOERR) then
+          write(*,*) "Error: Could not open that file either"
+          write(*,*) "Might as well stop here"
+          stop
+        endif
       endif
     endif
-  endif
-
-  ! Get ID for phisinit
-  ierr=NF_INQ_VARID(infid2,"phisinit",tmpvarid)
-  if (ierr.ne.NF_NOERR) then
-    write(*,*) "Error: Failed to get phisinit ID"
-    stop
-  endif
-  ! Get physinit
-  ierr=NF_GET_VAR_REAL(infid2,tmpvarid,phisinit)
-  if (ierr.ne.NF_NOERR) then
-    write(*,*) "Error: Failed reading phisinit"
-    stop
-  endif
-  ! Close file
-  write(*,*) 'OK, got phisinit'
-  ierr=NF_CLOSE(infid2)
+
+    ! Get ID for phisinit
+    ierr=NF_INQ_VARID(infid2,"phisinit",tmpvarid)
+    if (ierr.ne.NF_NOERR) then
+      write(*,*) "Error: Failed to get phisinit ID"
+      stop
+    endif
+  
+    ! Get physinit
+    ierr=NF_GET_VAR_REAL(infid2,tmpvarid,phisinit)
+    if (ierr.ne.NF_NOERR) then
+      write(*,*) "Error: Failed reading phisinit"
+      stop
+    endif
+    ! Close file
+    write(*,*) 'OK, got phisinit'
+    ierr=NF_CLOSE(infid2)
+  else
+    ierr=NF_GET_VAR_REAL(infid,tmpvarid,phisinit)
+    if (ierr.ne.NF_NOERR) then
+      write(*,*) "Error: Failed reading phisinit"
+      stop
+    endif
+  endif
 else
   ierr=NF_GET_VAR_REAL(infid,tmpvarid,phisinit)
@@ -697 +709 @@
   endif
 endif
-
 !===============================================================================
 ! 1.4 Choose and build the new vertical coordinate