Changeset 3369 for trunk/LMDZ.MARS/libf

Timestamp:

Jun 12, 2024, 11:00:16 AM (7 months ago)

Author:

emillour

Message:

Mars 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 "outputs_per_sol" to specify output rate 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.MARS/libf/phymars

Files:

• conf_phys.F (modified) (3 diffs)
• dyn1d/init_testphys1d_mod.F90 (modified) (3 diffs)
• dyn1d/testphys1d.F90 (modified) (1 diff)
• physiq_mod.F (modified) (2 diffs)
• time_phylmdz_mod.F90 (modified) (3 diffs)
• writediagfi.F (modified) (7 diffs)
• writediagmicrofi.F (modified) (7 diffs)
• writediagsoil.F90 (modified) (4 diffs)

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

@@ -22 +22 @@
      &                     frost_albedo_threshold, inert_h2o_ice,
      &                     frost_metam_threshold,old_wsublimation_scheme
-      use time_phylmdz_mod, only: ecritphy,day_step,iphysiq,ecritstart,
-     &                            daysec,dtphys
+      use time_phylmdz_mod, only: steps_per_sol,outputs_per_sol,iphysiq,
+     &                            ecritstart,daysec,dtphys
       use dimradmars_mod, only: naerkind, name_iaer,
      &                      ini_scatterers,tauvis
@@ -55 +55 @@
       INTEGER ierr,j
       character(len=20),parameter :: modname="conf_phys"
+      
+      real :: ecritphy ! to check that this obsolete flag is no longer used...
  
       CHARACTER ch1*12
@@ -60 +62 @@
       ! read in some parameters from "run.def" for physics,
       ! or shared between dynamics and physics.
-      ecritphy=240 ! default value
+      ecritphy=-666 ! dummy default value
       call getin_p("ecritphy",ecritphy) ! frequency of outputs in physics,
                                       ! in dynamical steps
-      day_step=960 ! default value
-      call getin_p("day_step",day_step) ! number of dynamical steps per day
+      if (ecritphy/=-666) then
+        call abort_physic(modname,
+     &     "Error: parameter ecritphy is obsolete! Remove it! "//
+     &     "And use outputs_per_sol instead",1)
+      endif
+      
+      outputs_per_sol=4 ! default value, 4 outputs per sol
+      call getin_p("outputs_per_sol",outputs_per_sol)
+      ! check that indeed it is possible for given physics time step
+      if (modulo(steps_per_sol,outputs_per_sol)/=0) then
+        write(*,*) "Error: outputs_per_sol = ",outputs_per_sol
+        write(*,*) " is not a divisor of number of steps per sol = ",
+     &             steps_per_sol
+        call abort_physic(modname,
+     &     "Error: inadequate value for outputs_per_sol",1)
+      endif 
+      
       iphysiq=20 ! default value
       call getin_p("iphysiq",iphysiq) ! call physics every iphysiq dyn step

trunk/LMDZ.MARS/libf/phymars/dyn1d/init_testphys1d_mod.F90

@@ -11 +11 @@
 use ioipsl_getincom,          only: getin ! To use 'getin'
 use comcstfi_h,               only: pi, rad, omeg, g, mugaz, rcp, r, cpp
-use time_phylmdz_mod,         only: daysec, day_step, ecritphy, iphysiq
+use time_phylmdz_mod, only: daysec, steps_per_sol, outputs_per_sol, iphysiq
 use planete_h,                only: year_day, periheli, aphelie, peri_day, obliquit, emin_turb, lmixmin
 use surfdat_h,                only: albedodat, z0_default, z0, emissiv, emisice, albedice, iceradius, dtemisice,      &
@@ -287 +287 @@
 nsoil = nsoilmx
 
-day_step = 48 ! Default value for day_step
+steps_per_sol = 48 ! Default value for day_step (old name for steps_per_sol)
 write(*,*)'Number of time steps per sol?'
-call getin("day_step",day_step)
-write(*,*) " day_step = ",day_step
-
-ecritphy = day_step ! Default value for ecritphy, output every time step
+call getin("day_step",steps_per_sol)
+write(*,*) " steps_per_sol (aka day_step) = ",steps_per_sol
+
+outputs_per_sol = steps_per_sol ! Default value for outputs_per_sol
 
 ndt = 10 ! Default value for ndt
@@ -300 +300 @@
 
 dayn = day0 + ndt
-ndt = ndt*day_step
-dttestphys = daysec/day_step
+ndt = ndt*steps_per_sol
+dttestphys = daysec/steps_per_sol
 
 ! Imposed surface pressure

trunk/LMDZ.MARS/libf/phymars/dyn1d/testphys1d.F90

@@ -8 +8 @@
 use tracer_mod,          only: igcm_h2o_vap, igcm_h2o_ice, igcm_co2, noms
 use comcstfi_h,          only: pi, g, rcp, cpp
-use time_phylmdz_mod,    only: daysec, day_step
+use time_phylmdz_mod, only: daysec
 use dimradmars_mod,      only: tauvis, totcloudfrac, albedo
 use dust_param_mod,      only: tauscaling

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

@@ -65 +65 @@
       use conc_mod, only: init_r_cp_mu, update_r_cp_mu_ak, rnew,
      &                    cpnew, mmean
-      use time_phylmdz_mod, only: iphysiq, day_step, ecritstart, daysec
+      use time_phylmdz_mod, only: steps_per_sol
+      use time_phylmdz_mod, only: iphysiq, ecritstart, daysec
       use dimradmars_mod, only: aerosol, totcloudfrac,
      &                          dtrad, fluxrad_sky, fluxrad, albedo,
@@ -1007 +1008 @@
            ENDIF !end callnlte
 
-c          Find number of layers for LTE radiation calculations
-           IF(MOD(iphysiq*(icount-1),day_step).EQ.0)
+!          Find number of layers for LTE radiation calculations
+!          (done only once per sol)
+           IF(MOD((icount-1),steps_per_sol).EQ.0)
      &          CALL nlthermeq(ngrid,nlayer,zplev,zplay)
 

trunk/LMDZ.MARS/libf/phymars/time_phylmdz_mod.F90

@@ -4 +4 @@
     REAL,SAVE    :: dtphys      ! physics time step (s)
 !$OMP THREADPRIVATE(dtphys)
-    INTEGER,SAVE :: day_step    ! number of dynamical steps per day
-                                ! (set via conf_phys)
-!$OMP THREADPRIVATE(day_step)
+
     REAL,SAVE    :: daysec     ! length of day (s)
 !$OMP THREADPRIVATE(daysec)
+
+    INTEGER,SAVE :: steps_per_sol ! number of physics steps per sol 
+!$OMP THREADPRIVATE(steps_per_sol)
+
     INTEGER,SAVE :: day_ini     ! initial day of the run
 !$OMP THREADPRIVATE(day_ini)
@@ -17 +19 @@
 !$OMP THREADPRIVATE(hour_ini)
 
-    INTEGER,SAVE :: ecritphy    ! for diagfi.nc outputs, write every ecritphy
-                                ! dynamical steps (set via conf_phys)
-!$OMP THREADPRIVATE(ecritphy)
+    INTEGER,SAVE :: outputs_per_sol ! for diagfi.nc outputs, number of outputs
+                                    ! per sol (set via conf_phys)
+!$OMP THREADPRIVATE(outputs_per_sol)
+
     INTEGER,SAVE :: iphysiq   ! call physics every iphysiq dynamical step
                               ! (set via conf_phys)
@@ -43 +46 @@
     dtphys=dtphys_
     
+    ! compute number of physics steps per sol
+    steps_per_sol=nint(daysec/dtphys)
+    
   END SUBROUTINE init_time
 

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

@@ -41 +41 @@
       use surfdat_h, only: phisfi
       use geometry_mod, only: cell_area
-      use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
+      use time_phylmdz_mod, only: steps_per_sol, outputs_per_sol
+      use time_phylmdz_mod, only: day_ini
       USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
      &                               is_master, gather
@@ -73 +74 @@
       REAL area((nbp_lon+1),nbp_lat)
 
-      integer irythme
+      integer isample
       integer ierr,ierr2
       integer i,j,l, ig0
@@ -121 +122 @@
 
 !***************************************************************
-!Sortie des variables au rythme voulu
-
-      irythme = int(ecritphy) ! output rate set by ecritphy
+! Compute the output rate
+
+      isample=steps_per_sol/outputs_per_sol
 
 !***************************************************************
@@ -267 +268 @@
 !------------------------------------------------------------------------
       if (nom.eq.firstnom) then
-          zitau = zitau + iphysiq
+          zitau = zitau + 1
       end if
 
@@ -274 +275 @@
 !--------------------------------------------------------
 
-      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)
@@ -287 +288 @@
            ntime=ntime+1 ! increment # of stored time steps
            ! compute corresponding date (in days and fractions thereof)
-           date=(zitau +1.)/day_step
+           date=(zitau +1.)/steps_per_sol
            ! Get NetCDF ID of 'Time' variable
            ierr= NF_INQ_VARID(nid,"Time",varid)
@@ -620 +621 @@
         endif ! of if (dim.eq.3) elseif(dim.eq.2)...
 
-      endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
+      endif ! of if ( MOD(zitau+1,isample) .eq.0.)
 
       if (is_master) then

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

@@ -45 +45 @@
       use surfdat_h, only: phisfi
       use geometry_mod, only: cell_area
-      use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
+      use time_phylmdz_mod, only: steps_per_sol, outputs_per_sol
+      use time_phylmdz_mod, only: day_ini
       USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
      &                               is_master, gather
@@ -80 +81 @@
       REAL area((nbp_lon+1),nbp_lat)
 
-      integer irythme
+      integer isample
       integer ierr,ierr2
       integer i,j,l, ig0
@@ -124 +125 @@
 
 !***************************************************************
-!Sortie des variables au rythme voulu
-
-      irythme = int(ecritphy) ! output rate set by ecritphy
+! Compute the output rate
+
+      isample = steps_per_sol/outputs_per_sol
 
 !***************************************************************
@@ -280 +281 @@
 !------------------------------------------------------------------------
       if ((nom.eq.firstnom) .and. (microstep.eq.1)) then
-          zitau = zitau + iphysiq
+          zitau = zitau + 1
       end if
 
@@ -287 +288 @@
 !--------------------------------------------------------
 
-      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)
@@ -300 +301 @@
            ntime=ntime+1 ! increment # of stored time steps
            ! compute corresponding date (in days and fractions thereof)
-           date=(zitau +1.)/day_step
+           date=(zitau +1.)/steps_per_sol
            subdate=0.
            ! Get NetCDF ID of 'Time' variable
@@ -668 +669 @@
         endif ! of if (dim.eq.3) elseif(dim.eq.2)...
 
-      endif ! of if ( MOD(zitau+1,irythme) .eq.0.)
+      endif ! of if ( MOD(zitau+1,isample) .eq.0.)
 
       if (is_master) then

trunk/LMDZ.MARS/libf/phymars/writediagsoil.F90

@@ -23 +23 @@
 use comsoil_h, only: mlayer, nsoilmx, inertiedat
 use geometry_mod, only: cell_area
-use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
+use time_phylmdz_mod, only: steps_per_sol, outputs_per_sol
 use mod_phys_lmdz_para, only: is_mpi_root, is_master, gather
 use mod_grid_phy_lmdz, only: klon_glo, Grid1Dto2D_glo, nbp_lon, nbp_lat
@@ -109 +109 @@
   
   ! Set output sample rate
-  isample=int(ecritphy) ! same as for diagfi outputs
+  isample=steps_per_sol/outputs_per_sol ! same as for diagfi outputs
   ! Note ecritphy is known from control.h
   
@@ -175 +175 @@
 if (name.eq.firstname) then
   ! if we run across 'firstname', then it is a new time step
-  zitau=zitau+iphysiq
-  ! Note iphysiq is known from control.h
+  zitau=zitau+1
 endif
 
@@ -185 +184 @@
   if (name.eq.firstname) then
     ntime=ntime+1
-    date=float(zitau+1)/float(day_step)
-    ! Note: day_step is known from control.h
+    date=float(zitau+1)/float(steps_per_sol)
     
     if (is_master) then