Changeset 4027 for trunk/LMDZ.PLUTO

Timestamp:

Jan 20, 2026, 10:46:15 AM (2 days ago)

Author:

debatzbr

Message:

Pluto PCM: Adding a slow_diagfi flag for 1D model from Generic PCM (revision 3928).
BBT

Location:

trunk/LMDZ.PLUTO/libf

Files:

• muphypluto/mp2m_clouds.F90 (modified) (1 diff)
• phypluto/inifis_mod.F90 (modified) (2 diffs)
• phypluto/time_phylmdz_mod.F90 (modified) (1 diff)
• phypluto/writediagfi.F (modified) (7 diffs)
• phypluto/writediagspecIR.F (modified) (3 diffs)
• phypluto/writediagspecVI.F (modified) (3 diffs)

trunk/LMDZ.PLUTO/libf/muphypluto/mp2m_clouds.F90

@@ -360 +360 @@
         ! Saturation ratio:
         !~~~~~~~~~~~~~~~~~~
-        where ((z_Xvap / qsat) > 1e5)
-          Xsat = 1e5
+        where ((z_Xvap / qsat) > 1e8)
+          Xsat = 1e8
         elsewhere
           Xsat = z_Xvap / qsat

trunk/LMDZ.PLUTO/libf/phypluto/inifis_mod.F90

@@ -18 +18 @@
   use comgeomfi_h, only: totarea, totarea_planet
   use comsoil_h, only: ini_comsoil_h, nsoilmx, lay1_soil, alpha_soil
-  use time_phylmdz_mod, only: diagfi_output_rate,startfi_output_rate, &
+  use time_phylmdz_mod, only: diagfi_output_rate,startfi_output_rate,slow_diagfi, &
                               init_time, daysec, dtphys
   use comcstfi_mod, only: rad, cpp, g, r, rcp, &
@@ -185 +185 @@
                                diagfi_output_rate
 
+     if ((is_master).and.(ngrid.eq.1)) write(*,*) trim(rname)//&
+       ": Open/close diagfi.nc at output rate (rather than once) ?"
+     slow_diagfi =.false. ! default value, open/close diagfi once (1D only)
+           call getin_p("slow_diagfi",slow_diagfi) ! if true, open/close the diagfi.nc
+                                                   ! at output frequency instead of once
+                                                   ! (slower but required for debug)
+           if ((is_master).and.(ngrid.eq.1)) write(*,*) trim(rname)//&
+             ": slow_diagfi = ", slow_diagfi
+     
      if (is_master) write(*,*) trim(rname)//&
        ": Output rate for start/startfi.nc files (in physics steps) ?"

trunk/LMDZ.PLUTO/libf/phypluto/time_phylmdz_mod.F90

@@ -14 +14 @@
     INTEGER,SAVE :: startfi_output_rate ! mainly for debugging
 !$OMP THREADPRIVATE(diagfi_output_rate,startfi_output_rate)
+
+    LOGICAL,SAVE :: slow_diagfi ! to handle wether the netcdf file is
+                                ! opened/close once or at output frequency
+!$OMP THREADPRIVATE(slow_diagfi)
 
 CONTAINS

trunk/LMDZ.PLUTO/libf/phypluto/writediagfi.F

@@ -42 +42 @@
       use geometry_mod, only: cell_area
       use time_phylmdz_mod, only: diagfi_output_rate,dtphys,daysec
-      use time_phylmdz_mod, only: day_ini
+      use time_phylmdz_mod, only: day_ini, nday, slow_diagfi
       USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
      &                               is_master, gather
@@ -79 +79 @@
 
       integer,save :: zitau=0
-      character(len=40),save :: firstnom='1234567890'
-!$OMP THREADPRIVATE(zitau,firstnom)
+      integer,save :: lastzitau=0
+      character(len=27),save :: firstnom='1234567890'
+      character(len=27),save :: prevnom='1234567890'
+      character(len=27),save :: lastnom='1234567890'
+!$OMP THREADPRIVATE(zitau,lastzitau,firstnom,prevnom,lastnom)
 
 ! Ajouts
@@ -86 +89 @@
 !$OMP THREADPRIVATE(ntime)
       integer :: idim,varid
-      integer :: nid
+      integer, save :: nid
+!$OMP THREADPRIVATE(nid)
       character(len=*),parameter :: fichnom="diagfi.nc"
       integer, dimension(4) :: id
@@ -132 +136 @@
       IF (firstcall) THEN
          firstcall=.false.
+
+         ! Compute the lastzitau (i.e. last timestep-1)
+               lastzitau=nday*nint(daysec/dtphys)-1
+               if (MOD(lastzitau+1,diagfi_output_rate).ne.0.) then
+                 ! If so, output rate is less than once per sol
+                 ! We must adjust zitau to
+                 lastzitau=lastzitau-MOD(lastzitau+1,diagfi_output_rate)
+               endif 
 
 !$OMP MASTER
@@ -256 +268 @@
          ENDIF
 
+         ierr= NF_CLOSE(nid) ! Close the NETCDF file once initialized
+
          endif ! of if (is_master)
 
-      else
-
-         if (is_master) then
-           ! only the master is required to do this
-
-           ! Open the NetCDF file
-           ierr = NF_OPEN(fichnom,NF_WRITE,nid)
-         endif ! of if (is_master)
-
       endif ! if (firstnom.eq.'1234567890')
+
+      ! Find lastnom
+            if (lastnom.eq.'1234567890') then
+               if (nom.eq.firstnom) then
+                  if (prevnom.ne.'1234567890') then
+                     lastnom=prevnom
+                  endif
+               endif
+               prevnom=nom
+            endif
 
 ! Increment time index 'zitau' if it is the "fist call" (at given time level)
@@ -288 +303 @@
 
         if (is_master) then
-           ! only the master is required to do this
+          ! only the master is required to do this
+
+                ! 1D and slow_diagfi=.false. => open/close once
+                if ((klon_glo.eq.1).and.(.not.slow_diagfi)) then
+                  ! if the very first time to write, open
+            if ((nom.eq.firstnom).and.
+     &         (((zitau+1)/diagfi_output_rate).eq.1)) then
+                    write(*,*) "Open NETCDF file for firstnom=", firstnom
+                    write(*,*) "zitau=", zitau
+                    ierr=NF_OPEN(fichnom,NF_WRITE,nid) ! open once in all simu
+                  endif
+                else ! 3D or slow_diagfi=.true. => open/close at output frequency
+                  ierr=NF_OPEN(fichnom,NF_WRITE,nid)           
+                endif
+
         if (nom.eq.firstnom) then
         ! We have identified a "first call" (at given date)
@@ -625 +654 @@
         endif ! of if (dim.eq.3) elseif(dim.eq.2)...
 
+        ! Only the master do it
+                    if (is_master) then
+                      ! 1D and slow_diagfi=.false. => open/close once
+                      if ((klon_glo.eq.1).and.(.not.slow_diagfi)) then
+                        ! if the very last time to write, close
+                        if ((nom.eq.lastnom).and.(zitau.eq.lastzitau)) then
+                          write(*,*) "Close NETCDF file for lastnom=",lastnom
+                          write(*,*) "zitau=",zitau
+                          ierr = NF_CLOSE(nid) ! close once in all simu
+                        endif
+                      else ! 3D or slow_diagfi=.true. => open/close at output frequency
+                        ierr = NF_CLOSE(nid)
+                      endif
+                    endif
+
       endif ! of if ( MOD(zitau+1,isample) .eq.0.)
 
-      if (is_master) then
-        ierr= NF_CLOSE(nid)
-      endif
-
       end

trunk/LMDZ.PLUTO/libf/phypluto/writediagspecIR.F

@@ -180 +180 @@
            call iniwrite_specIR(nid,day_ini,areafi_glo(1),1,1)
          ENDIF
+         ! Close the NetCDF file
+               ierr= NF_CLOSE(nid)
          endif ! of if (is_master)
 
          zitau = -1 ! initialize zitau
-      else
-         if (is_master) then
-           ! Open the NetCDF file
-           ierr = NF_OPEN(fichnom,NF_WRITE,nid)
-         endif
       endif ! if (firstnom.eq.'1234567890')
 
@@ -202 +199 @@
 
       if ( MOD(zitau+1,isample) .eq.0.) then
+
+        if (is_master) then
+                ! Open the NetCDF file
+                ierr = NF_OPEN(fichnom,NF_WRITE,nid)
+              endif
 
 ! Compute/write/extend 'Time' coordinate (date given in days)
@@ -334 +336 @@
         endif ! of if (dimpx.eq.3)
 
+        ! Close the NetCDF file
+              if (is_master) then
+                ierr= NF_CLOSE(nid)
+              endif
+
       endif ! of if ( MOD(zitau+1,isample) .eq.0.)
 
-      ! Close the NetCDF file
-      if (is_master) then
-        ierr= NF_CLOSE(nid)
-      endif
-
       end

trunk/LMDZ.PLUTO/libf/phypluto/writediagspecVI.F

@@ -179 +179 @@
            call iniwrite_specVI(nid,day_ini,areafi_glo(1),1,1)
          ENDIF
+         ! Close the NetCDF file
+               ierr= NF_CLOSE(nid)
          endif ! of if (is_master)
 
          zitau = -1 ! initialize zitau
-      else
-         if (is_master) then
-           ! Open the NetCDF file
-           ierr = NF_OPEN(fichnom,NF_WRITE,nid)
-         endif
       endif ! if (firstnom.eq.'1234567890')
 
@@ -207 +204 @@
 !       (like the 'histoire' outputs)
 !--------------------------------------------------------
+
+        if (is_master) then
+                ! Open the NetCDF file
+                ierr = NF_OPEN(fichnom,NF_WRITE,nid)
+              endif
 
         if (nom.eq.firstnom) then
@@ -333 +335 @@
         endif ! of if (dimpx.eq.3)
 
+        ! Close the NetCDF file
+              if (is_master) then
+                ierr= NF_CLOSE(nid)
+              endif
+
       endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
 
-      ! Close the NetCDF file
-      if (is_master) then
-        ierr= NF_CLOSE(nid)
-      endif
-
       end