Changeset 3828 for dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat

Timestamp:

May 23, 2015, 8:10:21 AM (11 years ago)

Author:

millour

Message:

A couple of bug fixes and adaptations.
Results are now identical when running seq or MPI or OpenMP or mixed MPI/OpenMP bench case.
Bench results change wrt revision 5 reference, because longitudes and latitudes in physics are now inherited from dynamics and no longer loaded from startphy.nc file.
EM

Location:

dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat

Files:

• mod_interface_dyn_phys.F90 (modified) (2 diffs)
• phylmd/iniphysiq.F90 (modified) (4 diffs)

dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/mod_interface_dyn_phys.F90

@@ -7 +7 @@
   
   
+CONTAINS
+  
 #ifdef CPP_PARA
 ! Interface with parallel physics,
-CONTAINS
-  
   SUBROUTINE Init_interface_dyn_phys
     USE mod_phys_lmdz_mpi_data
@@ -54 +54 @@
   
   END SUBROUTINE Init_interface_dyn_phys 
+#else
+  SUBROUTINE Init_interface_dyn_phys
+  ! dummy routine for seq case
+  END SUBROUTINE Init_interface_dyn_phys 
 #endif
 ! of #ifdef CPP_PARA

dynamico_lmdz/aquaplanet/LMDZ5/libf/dynlonlat_phylonlat/phylmd/iniphysiq.F90

@@ -79 +79 @@
   REAL,ALLOCATABLE :: boundslonfi_glo(:,:)
   REAL,ALLOCATABLE :: boundslatfi_glo(:,:)
-  REAL,ALLOCATABLE :: latfi(:)
-  REAL,ALLOCATABLE :: lonfi(:)
-  REAL,ALLOCATABLE :: cufi(:)
-  REAL,ALLOCATABLE :: cvfi(:)
-  REAL,ALLOCATABLE :: airefi(:)
-  REAL,ALLOCATABLE :: boundslonfi(:,:)
-  REAL,ALLOCATABLE :: boundslatfi(:,:)
+  ! local arrays, on given MPI/OpenMP domain:
+  REAL,ALLOCATABLE,SAVE :: latfi(:)
+  REAL,ALLOCATABLE,SAVE :: lonfi(:)
+  REAL,ALLOCATABLE,SAVE :: cufi(:)
+  REAL,ALLOCATABLE,SAVE :: cvfi(:)
+  REAL,ALLOCATABLE,SAVE :: airefi(:)
+  REAL,ALLOCATABLE,SAVE :: boundslonfi(:,:)
+  REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
+!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
 
   CALL init_physics_distribution(regular_lonlat, 4, nbp, ii, jj+1, nlayer, communicator)
@@ -120 +122 @@
   ALLOCATE(boundslonfi_glo(klon_glo,4))
   ALLOCATE(boundslatfi_glo(klon_glo,4))
- 
-  ALLOCATE(latfi(klon_glo),lonfi(klon_glo),cufi(klon_glo),cvfi(klon_glo))
-  ALLOCATE(airefi(klon_glo))
-  ALLOCATE(boundslonfi(klon_glo,4))
-  ALLOCATE(boundslatfi(klon_glo,4))
 
   IF (klon_glo>1) THEN ! general case
@@ -208 +205 @@
 
 !$OMP PARALLEL DEFAULT(SHARED) COPYIN(/temps/)
-  ! Now generate local lon/lat/cu/cv/area arrays
+  ! Now generate local lon/lat/cu/cv/area/bounds arrays
+  ALLOCATE(latfi(klon_omp),lonfi(klon_omp),cufi(klon_omp),cvfi(klon_omp))
+  ALLOCATE(airefi(klon_omp))
+  ALLOCATE(boundslonfi(klon_omp,4))
+  ALLOCATE(boundslatfi(klon_omp,4))
 
 
@@ -240 +241 @@
               lunout,prt_level,debug)
   
-!!$OMP END PARALLEL
-
   ! Additional initializations for aquaplanets
-!!$OMP PARALLEL
   IF (iflag_phys>=100) THEN
     CALL iniaqua(klon_omp, iflag_phys)