Changeset 3822 for dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Timestamp:

Apr 30, 2015, 3:22:39 PM (10 years ago)

Author:

millour

Message:

A couple of bug fixes.
Now the bench (in debug mode) yields identical results in seq/mpi/omp/mpi_omp, and also identical restart files to rev 5 (ie before any modifications to LMDZ5 source files).
EM

Location:

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd

Files:

• infotrac_phy.f90 (modified) (2 diffs)
• inifis_mod.F90 (modified) (3 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/infotrac_phy.f90

@@ -50 +50 @@
     CHARACTER(len=20),INTENT(IN) :: tname_(nqtot_) ! tracer short name for restart and diagnostics
     CHARACTER(len=23),INTENT(IN) :: ttext_(nqtot_) ! tracer long name for diagnostics
-    CHARACTER(len=4),INTENT(IN) :: type_trac_(nqtot_)
+    CHARACTER(len=4),INTENT(IN) :: type_trac_
     INTEGER,INTENT(IN) :: niadv_ (nqtot_) ! equivalent dyn / physique
     INTEGER,INTENT(IN) :: conv_flg_(nbtr_)
@@ -63 +63 @@
     ALLOCATE(ttext(nqtot))
     ttext(:) = ttext_(:)
-    ALLOCATE(type_trac(nqtot))
-    type_trac(:) = type_trac_(:)
+    type_trac = type_trac_
     ALLOCATE(niadv(nqtot))
     niadv(:)=niadv_(:)

dynamico_lmdz/aquaplanet/LMDZ5/libf/phylmd/inifis_mod.F90

@@ -12 +12 @@
   INTEGER,SAVE :: anneeref ! reference year, ase deifined in run.def
   INTEGER,SAVE :: nday ! number of days to run
-!$THREADPRIVATE(daysec,dtphys,day_step,iphysiq,dayref,anneeref,nday)
+!$OMP THREADPRIVATE(daysec,dtphys,day_step,iphysiq,dayref,anneeref,nday)
   INTEGER,SAVE :: annee_ref ! reference year as read from start file
   INTEGER,SAVE :: day_ini
   INTEGER,SAVE :: day_end
-!$THREADPRIVATE(annee_ref,day_ini,day_end)
+!$OMP THREADPRIVATE(annee_ref,day_ini,day_end)
   INTEGER,SAVE :: itau_phy
   INTEGER,SAVE :: itaufin
@@ -22 +22 @@
   INTEGER,SAVE :: day_ref
   REAL,SAVE :: jD_ref
-!$THREADPRIVATE(itau_phy,itaufin,start_time,day_ref,JD_ref)
+!$OMP THREADPRIVATE(itau_phy,itaufin,start_time,day_ref,JD_ref)
   LOGICAL,SAVE :: offline
   INTEGER,SAVE :: raz_date
@@ -29 +29 @@
   INTEGER,SAVE :: prt_level ! Output level
   LOGICAL,SAVE :: debug ! flag to specify if in "debug mode"
-!$THREADPRIVATE(offline,raz_date,config_inca,lunout,prt_level,debug)
+!$OMP THREADPRIVATE(offline,raz_date,config_inca,lunout,prt_level,debug)
 
 CONTAINS