Changeset 2601 for LMDZ5/trunk/libf/dynphy_lonlat

Timestamp:

Jul 24, 2016, 11:51:55 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn temps.h into module temps_mod.F90
EM

Location:

LMDZ5/trunk/libf/dynphy_lonlat

Files:

• calfis.F (modified) (1 diff)
• calfis_loc.F (modified) (1 diff)
• calfis_p.F (modified) (1 diff)
• phylmd/ce0l.F90 (modified) (2 diffs)
• phylmd/etat0dyn_netcdf.F90 (modified) (2 diffs)
• phylmd/etat0phys_netcdf.F90 (modified) (1 diff)
• phylmd/iniphysiq_mod.F90 (modified) (4 diffs)

LMDZ5/trunk/libf/dynphy_lonlat/calfis.F

@@ -93 +93 @@
       include "dimensions.h"
       include "paramet.h"
-      include "temps.h"
 
       INTEGER ngridmx

LMDZ5/trunk/libf/dynphy_lonlat/calfis_loc.F

@@ -111 +111 @@
       include "dimensions.h"
       include "paramet.h"
-      include "temps.h"
 
       INTEGER ngridmx

LMDZ5/trunk/libf/dynphy_lonlat/calfis_p.F

@@ -107 +107 @@
 #include "dimensions.h"
 #include "paramet.h"
-#include "temps.h"
 
       INTEGER ngridmx

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -37 +37 @@
                           pi, jmp1
   USE comvert_mod, ONLY: pa, preff, pressure_exner
+  USE temps_mod, ONLY: calend, day_ini, dt
 
   IMPLICIT NONE
@@ -46 +47 @@
   include "comgeom2.h"
   include "iniprint.h"
-  include "temps.h"
   include "logic.h"
   REAL               :: masque(iip1,jjp1)             !--- CONTINENTAL MASK

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0dyn_netcdf.F90

@@ -38 +38 @@
   USE comconst_mod, ONLY: pi, cpp, kappa
   USE comvert_mod, ONLY: ap, bp, preff, pressure_exner
+  USE temps_mod, ONLY: annee_ref, day_ref, itau_dyn, itau_phy
+  
   IMPLICIT NONE
 
@@ -47 +49 @@
   include "paramet.h"
   include "comgeom2.h"
-  include "temps.h"
   include "comdissnew.h"
   REAL, SAVE :: deg2rad

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/etat0phys_netcdf.F90

@@ -54 +54 @@
   include "comgeom2.h"
   include "dimsoil.h"
-  include "temps.h"
   include "clesphys.h"
   REAL, SAVE :: deg2rad

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -32 +32 @@
   USE inifis_mod, ONLY: inifis
   USE time_phylmdz_mod, ONLY: init_time
+  USE temps_mod, ONLY: annee_ref, day_ini, day_ref, start_time
   USE infotrac_phy, ONLY: init_infotrac_phy
   USE phystokenc_mod, ONLY: init_phystokenc
@@ -52 +53 @@
   include "dimensions.h"
   include "iniprint.h"
-  include "temps.h"
   include "tracstoke.h"
 
@@ -98 +98 @@
   ! --> now initialize things specific to the phylmd physics package
   
-!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
+!!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
+!$OMP PARALLEL DEFAULT(SHARED) &
+!       Copy all threadprivate variables in temps_mod
+!$OMP COPYIN(annee_ref, day_ini, day_ref, start_time)
 
   ! copy over preff , ap(), bp(), etc 
@@ -144 +147 @@
 #endif
   END IF
-!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
 
+!!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
+!$OMP PARALLEL DEFAULT(SHARED)
   ! Additional initializations for aquaplanets 
   IF (iflag_phys>=100) THEN