Changeset 1525 for trunk/LMDZ.MARS/libf

Timestamp:

Mar 30, 2016, 8:24:43 AM (9 years ago)

Author:

emillour

Message:

All GCMs:
More on enforcing dynamics/physics separation: get rid of references to "control_mod" from physics packages.
EM

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• conf_phys.F (modified) (2 diffs)
• dyn1d/testphys1d.F (modified) (2 diffs)
• phyetat0.F90 (modified) (3 diffs)
• physiq.F (modified) (2 diffs)
• time_phylmdz_mod.F90 (modified) (3 diffs)
• writediagfi.F (modified) (1 diff)
• writediagsoil.F90 (modified) (1 diff)

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

@@ -38 +38 @@
       use surfdat_h, only: albedo_h2o_ice, inert_h2o_ice,
      &                     frost_albedo_threshold
-      use control_mod, only: ecritphy
+      use time_phylmdz_mod, only: ecritphy,day_step,iphysiq,ecritstart,
+     &                            daysec,dtphys
       use planete_h
-      use time_phylmdz_mod, only: daysec,dtphys
       use dimradmars_mod, only: naerkind, name_iaer,
      &                      ini_scatterers,tauvis
@@ -50 +50 @@
 
       INTEGER,INTENT(IN) :: ngrid,nlayer,nq
-      INTEGER ig,ierr,j
+      INTEGER ierr,j
  
       CHARACTER ch1*12
-      CHARACTER ch80*80
-
-      ! read in 'ecritphy' (frequency of calls to physics, in dynamical steps)
-      ! (also done in dyn3d/defrun_new but not in LMDZ.COMMON)
-      call getin("ecritphy",ecritphy)
-      
+
+      ! read in some parameters from "run.def" for physics,
+      ! or shared between dynamics and physics.
+      ecritphy=240 ! default value
+      call getin("ecritphy",ecritphy) ! frequency of outputs in physics,
+                                      ! in dynamical steps
+      day_step=960 ! default value
+      call getin("day_step",day_step) ! number of dynamical steps per day
+      iphysiq=20 ! default value
+      call getin("iphysiq",iphysiq) ! call physics every iphysiq dyn step
+      ecritstart=0 ! default value
+      call getin("ecritstart",ecritstart) ! write a restart every ecristart steps
 ! --------------------------------------------------------------
 !  Reading the "callphys.def" file controlling some key options

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

@@ -11 +11 @@
      &                     watercaptag
       use slope_mod, only: theta_sl, psi_sl
-      use control_mod, only: day_step
       use phyredem, only: physdem0,physdem1
       use comgeomphy, only: initcomgeomphy
@@ -17 +16 @@
      &                     obliquit, emin_turb, lmixmin
       use comcstfi_h, only: pi, rad, omeg, g, mugaz, rcp, r, cpp
-      use time_phylmdz_mod, only: daysec, dtphys
+      use time_phylmdz_mod, only: daysec, dtphys, day_step
       use dimradmars_mod, only: tauscaling,tauvis
       USE comvert_mod, ONLY: ap,bp,aps,bps,pa,preff,sig

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

@@ -6 +6 @@
   use surfdat_h, only: phisfi, albedodat, z0, z0_default,&
                        zmea, zstd, zsig, zgam, zthe
-  use control_mod, only: timestart
   use iostart, only: nid_start, open_startphy, close_startphy, &
                      get_field, get_var, inquire_field, &
                      inquire_dimension, inquire_dimension_length
+  use ioipsl_getincom, only : getin
 
   implicit none
@@ -79 +79 @@
       LOGICAL :: found
 
+      REAL :: timestart ! to pick which initial state to start from
+
 ! open physics initial state file:
 call open_startphy(fichnom)
@@ -167 +169 @@
       
 ! Time axis
+! obtain timestart from run.def
+timestart=-9999 ! default value
+call getin("timestart",timestart)
+
 found=inquire_dimension("Time")
 if (.not.found) then

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

@@ -25 +25 @@
       use slope_mod, only: theta_sl, psi_sl
       use conc_mod, only: rnew, cpnew, mmean
-      use control_mod, only: iphysiq, day_step, ecritstart
+      use time_phylmdz_mod, only: iphysiq, day_step, ecritstart, daysec
       use dimradmars_mod, only: tauscaling, aerosol,
      &                          dtrad, fluxrad_sky, fluxrad, albedo,
@@ -34 +34 @@
      &                     obliquit
       USE comcstfi_h, only: r, cpp, mugaz, g, rcp, pi, rad
-      use time_phylmdz_mod, only: daysec
       use param_v4_h, only: nreact,n_avog, 
      &                      fill_data_thermos, allocate_param_thermos

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

@@ -4 +4 @@
     REAL,SAVE    :: dtphys      ! physics time step (s)
 !$OMP THREADPRIVATE(pdtphys)
+    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)
@@ -12 +15 @@
 !$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 :: iphysiq   ! call physics every iphysiq dynamical step
+                              ! (set via conf_phys)
+!$OMP THREADPRIVATE(iphysiq)
+    INTEGER,SAVE :: ecritstart ! write a restart state every ecritstart
+                               ! dynamical steps (set via conf_phys)
+!$OMP THREADPRIVATE(ecritstart)
 CONTAINS
 
   SUBROUTINE init_time(day_ini_, hour_ini_, daysec_, dtphys_)
+    USE ioipsl_getin_p_mod, ONLY : getin_p
     IMPLICIT NONE
     INTEGER,INTENT(IN) :: day_ini_
@@ -25 +38 @@
     daysec=daysec_
     dtphys=dtphys_
-
+    
   END SUBROUTINE init_time
 

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

@@ -40 +40 @@
 !=================================================================
       use surfdat_h, only: phisfi
-      use control_mod, only: ecritphy, day_step, iphysiq
+      use time_phylmdz_mod, only: ecritphy, day_step, iphysiq, day_ini
       USE mod_phys_lmdz_para, only : is_parallel, is_mpi_root,
      &                               is_master, gather
       USE mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo
-      USE time_phylmdz_mod, ONLY: day_ini
       implicit none
 

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

@@ -13 +13 @@
 
 use comsoil_h, only: nsoilmx
-use control_mod, only: ecritphy, day_step, iphysiq
+use time_phylmdz_mod, only: ecritphy, day_step, iphysiq
 use mod_phys_lmdz_para, only : is_mpi_root, is_master, gather
 use mod_grid_phy_lmdz, only : klon_glo, Grid1Dto2D_glo