Changeset 2603 for LMDZ5/trunk/libf/dyn3dmem/gcm.F90

Timestamp:

Jul 25, 2016, 11:31:56 AM (8 years ago)

Author:

Ehouarn Millour

Message:

Cleanup in the dynamics: turn logic.h into module logic_mod.F90
EM

File:

• LMDZ5/trunk/libf/dyn3dmem/gcm.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/dyn3dmem/gcm.F90

@@ -22 +22 @@
 #endif
   USE comconst_mod, ONLY: cpp, daysec, dtphys, dtvr, g, r, rad
+  USE logic_mod ! all of it, because of copyin clause when calling leapfrog
   USE temps_mod, ONLY: calend,start_time,annee_ref,day_ref, &
                        itau_dyn,itau_phy,day_ini,jD_ref,jH_ref,day_end, &
@@ -61 +62 @@
   include "comdissnew.h"
   include "comgeom.h"
-  include "logic.h"
   include "ener.h"
   include "description.h"
@@ -453 +453 @@
 
   !!$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/,/logici/,/logicl/)
-  !$OMP PARALLEL DEFAULT(SHARED) COPYIN(/logici/,/logicl/) &
+  !$OMP PARALLEL DEFAULT(SHARED) &
   !     Copy all threadprivate variables in temps_mod
   !$OMP COPYIN(dt,jD_ref,jH_ref,start_time,hour_ini,day_ini,day_end) &
-  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend)
+  !$OMP COPYIN(annee_ref,day_ref,itau_dyn,itau_phy,itaufin,calend) &
+  !     Copy all threadprivate variables from logic_mod
+  !$OMP COPYIN(purmats,forward,leapf,apphys,statcl,conser,apdiss,apdelq) &
+  !$OMP COPYIN(saison,ecripar,fxyhypb,ysinus,read_start,ok_guide) &
+  !$OMP COPYIN(ok_strato,ok_gradsfile,ok_limit,ok_etat0) &
+  !$OMP COPYIN(iflag_phys,iflag_trac)
   CALL leapfrog_loc(ucov,vcov,teta,ps,masse,phis,q,time_0)
   !$OMP END PARALLEL