Changeset 2511

Timestamp:

Apr 30, 2021, 9:55:53 PM (4 years ago)

Author:

aslmd

Message:

update of r2507: streamlining day_end from dynamics to physics to avoid using a dynamical module in the physics. put changes in 3 interfaces: LMDZ, DYNAMICO, and WRF

Location:

trunk

Files:

• ICOSA_LMDZ/src/phymars/interface_icosa_lmdz.f90 (modified) (3 diffs)
• LMDZ.MARS/README (modified) (1 diff)
• LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90 (modified) (2 diffs)
• LMDZ.MARS/libf/phymars/phys_state_var_init_mod.F90 (modified) (3 diffs)
• LMDZ.MARS/libf/phymars/physiq_mod.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/time_phylmdz_mod.F90 (modified) (3 diffs)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_mars_lmd_new/iniphysiq_mod.F (modified) (2 diffs)

trunk/ICOSA_LMDZ/src/phymars/interface_icosa_lmdz.f90

@@ -201 +201 @@
   INTEGER :: annee_ref  
   INTEGER :: day_ref    
-  INTEGER :: day_ini    
+  INTEGER :: day_ini
+  INTEGER :: day_end
+    
   REAL    :: start_time 
   REAL    :: physics_timestep    
@@ -373 +375 @@
     ndays=nint(itaumax*(dt/day_length))! number of days to run
     physics_timestep=dt*itau_physics
+    day_end=day_ini+ndays
 
 !!!    CALL inifis(klon_omp,llm,nqtot,start_day,day_length,ndays,physics_timestep, &
@@ -384 +387 @@
 !!!
    CALL phys_state_var_init(klon_omp,llm,nqtot,tname, &
-                       day_ini,hour_ini,day_length,physics_timestep, &
+                       day_ini,day_end,hour_ini,&
+                       day_length,physics_timestep, &
                        radius,g,kappa*cpp,cpp, &
                        dyn_nqperes,dyn_nqfils)

trunk/LMDZ.MARS/README

@@ -3355 +3355 @@
 the next run_monthX is now well written, with a formulation that is more coherent with deftank/occigen/run_month1 version
 + the PBS memory specifications for the CICLAD job are set to more relevant values
+
+== 30/04/2021 == AS
+update of changes by RV on 27/04/2021; streamlining day_end to avoid using a dynamical module in the physics.

trunk/LMDZ.MARS/libf/dynphy_lonlat/phymars/iniphysiq_mod.F90

@@ -14 +14 @@
                      nqperes,nqfils! MVals: variables isotopes
 use comgeomfi_h, only: ini_fillgeom
-use temps_mod, only: day_ini, hour_ini
+use temps_mod, only: day_ini, day_end, hour_ini
 use phys_state_var_init_mod, only: phys_state_var_init
 use inigeomphy_mod, only: inigeomphy
@@ -71 +71 @@
 
 call phys_state_var_init(klon_omp,nlayer,nqtot,tname, &
-                         day_ini,hour_ini,punjours,ptimestep, &
+                         day_ini,day_end,hour_ini,&
+                         punjours,ptimestep, &
                          prad,pg,pr,pcpp, &
                          nqperes,nqfils) ! MVals: variables isotopes

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

@@ -4 +4 @@
 
       SUBROUTINE phys_state_var_init(ngrid,nlayer,nq,tname, &
-                                     day_ini,hour_ini,pdaysec,ptimestep, &
+                                     day_ini,day_end,hour_ini,pdaysec,ptimestep, &
                                      prad,pg,pr,pcpp, &
                                      dyn_nqperes,dyn_nqfils)! MVals: variables isotopes
@@ -68 +68 @@
       INTEGER,INTENT(IN) :: ngrid,nlayer,nq
       CHARACTER(len=*),INTENT(IN) :: tname(nq)
-      INTEGER,INTENT(IN) :: day_ini
+      INTEGER,INTENT(IN) :: day_ini, day_end
       REAL,INTENT(IN) :: hour_ini
       REAL,INTENT(IN) :: pdaysec,ptimestep,prad,pg,pr,pcpp
@@ -92 +92 @@
 
       ! Initialize some "temporal and calendar" related variables
-      call init_time(day_ini,hour_ini,pdaysec,ptimestep)
+      call init_time(day_ini,day_end,hour_ini,pdaysec,ptimestep)
 
       ! allocate "slope_mod" arrays

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

@@ -86 +86 @@
       USE vertical_layers_mod, ONLY: ap,bp,aps,bps,presnivs,pseudoalt
       USE mod_phys_lmdz_omp_data, ONLY: is_omp_master
+      USE time_phylmdz_mod, ONLY: day_end
 #endif
-      USE temps_mod, ONLY: day_end
 
 #ifdef CPP_XIOS      

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

@@ -11 +11 @@
     INTEGER,SAVE :: day_ini     ! initial day of the run
 !$OMP THREADPRIVATE(day_ini)
+    INTEGER,SAVE :: day_end     ! final day of the run
+!$OMP THREADPRIVATE(day_end)
     REAL,SAVE :: hour_ini       ! start time (fraction of day) of the run
                                 ! 0=<hour_ini<1
@@ -26 +28 @@
 CONTAINS
 
-  SUBROUTINE init_time(day_ini_, hour_ini_, daysec_, dtphys_)
-    USE ioipsl_getin_p_mod, ONLY : getin_p
+  SUBROUTINE init_time(day_ini_, day_end_, hour_ini_, daysec_, dtphys_)
+
     IMPLICIT NONE
     INTEGER,INTENT(IN) :: day_ini_
+    INTEGER,INTENT(IN) :: day_end_
     REAL,INTENT(IN) :: hour_ini_
     REAL,INTENT(IN) :: daysec_
@@ -35 +38 @@
     
     day_ini=day_ini_
+    day_end=day_end_
     hour_ini=hour_ini_
     daysec=daysec_

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/phys/dynphy_wrf_mars_lmd_new/iniphysiq_mod.F

@@ -36 +36 @@
 real,intent(in) :: piphysiq   ! call physics every piphysiq dynamical timesteps
 
+! used in GCM but not in mesoscale. dummy initialization.
+integer :: pdayend=0 ! end day of for the simulation [day_end]
+
 ! isotopes
 INTEGER :: nqperes
@@ -56 +59 @@
 !! initialize physical constants and arrays
 call phys_state_var_init(ngrid,nlayer,nq, traceurs, &
-                         pdayref,phour_ini,punjours,zdt_split, &
+                         pdayref,pdayend,phour_ini,punjours,zdt_split, &
                          prad,pg,pr,pcpp, &
                          nqperes,nqfils)