Changeset 4169

Timestamp:

Apr 2, 2026, 6:19:13 PM (28 hours ago)

Author:

jmauxion

Message:

Mars PCM:

• Switching output variable name from "phisfi" to "phisinit" in physiq_mod to ensure compatibility with utils.
• Updating xml files accordingly.
• Switching localtime and zrecast back to previous version (undoing changes in r4161).

JM

Location:

trunk/LMDZ.MARS

Files:

• changelog.txt (modified) (1 diff)
• deftank/xios/field_def_physics_mars.xml (modified) (1 diff)
• libf/phymars/physiq_mod.F (modified) (1 diff)
• util/localtime.F90 (modified) (1 diff)
• util/zrecast.F90 (modified) (2 diffs)

trunk/LMDZ.MARS/changelog.txt

@@ -5161 +5161 @@
 == 02/04/2026 == JM
 Updating callphys files in deftank according to the updated water cycle.
+
+== 02/04/2026 == JM
+- Switching output variable name from "phisfi" to "phisinit" in physiq_mod to
+ensure compatibility with utils.
+- Updating xml files accordingly.
+- Switching localtime and zrecast back to previous version (undoing changes in r4161).

trunk/LMDZ.MARS/deftank/xios/field_def_physics_mars.xml

@@ -177 +177 @@
                    long_name="Mesh area"
                    unit="m2" />
-            <field id="phisfi"
+            <field id="phisinit"
                    long_name="Surface geopotential"
                    unit="m2.s-2" />

trunk/LMDZ.MARS/libf/phymars/physiq_mod.F

@@ -3335 +3335 @@
          call write_output("pphi","Geopotential","m2s-2",
      &                    pphi(:,:))
-         call write_output("phisfi","Surface geopotential",
+         call write_output("phisinit","Surface geopotential",
      &                    "m2s-2",phisfi(:))
          call write_output("watercaptag","Watercap tag"

trunk/LMDZ.MARS/util/localtime.F90

@@ -1046 +1046 @@
 ierr=NF_INQ_VARID(infid,"phisinit",tmpvarid)
 if (ierr.ne.NF_NOERR) then
-  write(*,*) "Failed to get phisinit ID..."
-  write(*,*) "Try name phisfi (xios name)..."
-  ierr=NF_INQ_VARID(infid,"phisfi",tmpvarid)
-  if (ierr.ne.NF_NOERR) then
-    write(*,*) "Failed again. Ok, I skip phisinit."
-    phisinit = 0.
-    phis = .false.
-  else
-    ierr=NF_GET_VAR_REAL(infid,tmpvarid,phisinit)
-    if (ierr.ne.NF_NOERR) then
-      write(*,*) "init2 ERRO: Failed reading phisinit"
-      stop
-    endif
-    phis = .true.
-  endif
+  write(*,*) "Failed to get phisinit ID. OK"
+  phisinit = 0.
+  phis = .false.
 else
   ierr=NF_GET_VAR_REAL(infid,tmpvarid,phisinit)

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)
-  write(*,*) "Trying name phisfi (xios name)..."
-  ierr=NF_INQ_VARID(infid,"phisfi",tmpvarid)
+  infile2="diagfi.nc"
+  write(*,*) "         Trying file ",trim(infile2)
+  ierr=NF_OPEN(infile2,NF_NOWRITE,infid2)
   if (ierr.ne.NF_NOERR) then
-    write(*,*) "Failed to find phisfi..."
-    infile2="diagfi.nc"
+    write(*,*) "Problem: Could not find/open that file"
+    infile2="diagfi1.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="diagfi1.nc"
+      infile2="phisinit.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"
-        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
+        write(*,*) "Error: Could not open that file either"
+        write(*,*) "Might as well stop here"
+        stop
       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)
-  else
-    ierr=NF_GET_VAR_REAL(infid,tmpvarid,phisinit)
-    if (ierr.ne.NF_NOERR) then
-      write(*,*) "Error: Failed reading phisinit"
-      stop
-    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)
 else
   ierr=NF_GET_VAR_REAL(infid,tmpvarid,phisinit)
@@ -709 +697 @@
   endif
 endif
+
 !===============================================================================
 ! 1.4 Choose and build the new vertical coordinate