Changeset 2343 for LMDZ5/trunk/libf/dynlonlat_phylonlat

Timestamp:

Aug 20, 2015, 12:02:53 PM (10 years ago)

Author:

Ehouarn Millour

Message:

Another step towards a clean separation between physics and dynamics: adapted read_pstoke.F90, read_pstoke0.F90 initphysto.F90 and phystokenc.F90 (now module phystokenc_mod.F90) to not explicitely include/use file/modules from the dynamics.
In the process, added module "time_phylmdz_mod.F90" in the physics, which contains the information otherwise found in "temps.h" (which is in the dynamics) and should be used instead.
EM

File:

• LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90

@@ -23 +23 @@
                       indnum_fn_num,index_trac,&
                       niso,ntraceurs_zone,ntraciso
+  USE control_mod, ONLY: dayref,anneeref,day_step,nday,offline
   USE comgeomphy, ONLY: initcomgeomphy, &
                         airephy, & ! physics grid area (m2)
@@ -30 +31 @@
                         rlatd ! latitudes
   USE inifis_mod, ONLY: inifis
+  USE time_phylmdz_mod, ONLY: init_time
   USE infotrac_phy, ONLY: init_infotrac_phy
+  USE phystokenc_mod, ONLY: init_phystokenc
   USE phyaqua_mod, ONLY: iniaqua
   IMPLICIT NONE
@@ -42 +45 @@
   include "comvert.h"
   include "iniprint.h"
+  include "temps.h"
+  include "tracstoke.h"
 
   REAL, INTENT (IN) :: prad ! radius of the planet (m)
@@ -134 +139 @@
   ENDIF ! of IF (klon_glo>1)
 
-!$OMP PARALLEL 
+!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
   ! Initialize physical constants in physics:
   CALL inifis(punjours,prad,pg,pr,pcpp)
-  
+  CALL init_time(annee_ref,day_ref,day_ini,start_time,nday,ptimestep)
+
+  ! Copy over "offline" settings
+  CALL init_phystokenc(offline,istphy)
+
   ! copy over preff , ap(), bp(), etc 
   CALL init_vertical_layers(nlayer,preff,scaleheight, &