Changeset 3725 for trunk/LMDZ.GENERIC/libf/aeronostd

Timestamp:

Apr 15, 2025, 9:34:31 AM (4 months ago)

Author:

emillour

Message:

Generic PCM:
Change the way the rate of outputs for diagfi.nc files is specified:
IMPORTANT: Specifying "ecritphy" no longer possible and will trigger an error.
Use "diagfi_output_rate" to specify output rate (in physics steps) instead.
This should makes things (hopefully) clearer for users and also better
enforces a cleaner and clearer separation between dynamics and physics.
EM

Location:

trunk/LMDZ.GENERIC/libf/aeronostd

Files:

• calchim_asis.F90 (modified) (5 diffs)
• writediagspecUV.F (modified) (7 diffs)

trunk/LMDZ.GENERIC/libf/aeronostd/calchim_asis.F90

@@ -10 +10 @@
       USE comcstfi_mod
       use callkeys_mod
-      use time_phylmdz_mod, only: ecritphy, iphysiq ! output rate set by ecritphy
+      use time_phylmdz_mod, only: diagfi_output_rate ! output rate
       use types_asis,       only: v_phot_3d, jlabel, nb_phot_hv_max
       use chimiedata_h
@@ -133 +133 @@
       integer :: iter(nlayer)      !  Number of chemical iterations
                                    !  within one physical timestep 
-      integer :: icount
+      integer,intent(in) :: icount ! physics iteration number
 !     for output:
 
@@ -285 +285 @@
                         ig, zzlay, zzlev, zdens, zycol, ptimestep)
             surface_flux2(ig,:) = surface_flux2(ig,:) + surface_flux(ig,:)
-            if (ngrid==1) then
-              if(mod(icount,ecritphy).eq.0) then
-                surface_flux2(ig,:) = surface_flux2(ig,:)/float(ecritphy)
-              endif
-            else
-              if(mod(icount*iphysiq,ecritphy).eq.0) then
-                surface_flux2(ig,:) = surface_flux2(ig,:)*iphysiq/float(ecritphy)
-              endif
+            if(mod(icount,diagfi_output_rate).eq.0) then
+              !note that surface_flux2(:,:) is reset every diagfi_output_rate
+              surface_flux2(ig,:) = surface_flux2(ig,:)/float(diagfi_output_rate)
             endif
-         end if
+         end if ! of if (depos)
 
 !=======================================================================
@@ -405 +400 @@
             end do
             ! Restart flux average
-            if (ngrid == 1) then
-               if(mod(icount,ecritphy).eq.0) then
-                  surface_flux2(:,:) = 0.0
-               endif
-            else
-               if(mod(icount*iphysiq,ecritphy).eq.0) then
-                  surface_flux2(:,:) = 0.0
-               endif
+            if(mod(icount,diagfi_output_rate).eq.0) then
+              surface_flux2(:,:) = 0.0
             endif
          endif ! end depos
@@ -424 +413 @@
 
       end if ! of if (output)
-
-      return
 
 

trunk/LMDZ.GENERIC/libf/aeronostd/writediagspecUV.F

@@ -30 +30 @@
      &                              nbp_lon, nbp_lat, grid_type,
      &                              unstructured
-      use time_phylmdz_mod, only: ecritphy, iphysiq, day_step, day_ini
+      use time_phylmdz_mod, only: diagfi_output_rate, dtphys, daysec
+      use time_phylmdz_mod, only: day_ini
 
       implicit none
@@ -48 +49 @@
 !      real dx0
 
-      integer irythme
+      integer isample
       integer ierr
       integer iq
@@ -87 +88 @@
 !output frequency
 
-      irythme = ecritphy ! output with ecritphy frequency
-!EM+JL if the spetra need to be output more frequently, need to define a ecritSpec...
-!     irythme = iphysiq  ! sortie a tous les pas physique
+      isample = diagfi_output_rate ! output with ecritphy frequency
+!EM+JL if the spectra need to be output more frequently, need to define a 
+! diagspec_output_rate...
 
 !***************************************************************
@@ -173 +174 @@
 !------------------------------------------------------------------------
       if (nom.eq.firstnom) then
-          zitau = zitau + iphysiq
+          zitau = zitau + 1
       end if
 
@@ -180 +181 @@
 !--------------------------------------------------------
 
-      if ( MOD(zitau+1,irythme) .eq.0.) then
+      if ( MOD(zitau+1,isample) .eq.0.) then
 
 ! Compute/write/extend 'Time' coordinate (date given in days)
@@ -193 +194 @@
            ntime=ntime+1 ! increment # of stored time steps
            ! compute corresponding date (in days and fractions thereof)
-           date= float (zitau +1)/float (day_step)
+           date=(zitau +1)*(dtphys/daysec)
 
            if (is_master) then
@@ -313 +314 @@
         endif ! of if (dimpx.eq.3)
 
-      endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
+      endif ! of if ( MOD(zitau+1,isample) .eq.0.)
 
       ! Close the NetCDF file