Changeset 1896 for trunk/LMDZ.TITAN/libf/dynphy_lonlat

Timestamp:

Jan 17, 2018, 4:20:00 PM (7 years ago)

Author:

jvatant

Message:

Merge EM modifs on phy_common and xios
from LMDZ.GENERIC to LMDZ.TITAN.
See logs from r1673, r1682 and r1760
--JVO

Location:

trunk/LMDZ.TITAN/libf/dynphy_lonlat

Files:

• inigeomphy_mod.F90 (modified) (3 diffs, 1 prop)
• mod_interface_dyn_phys.F90 (modified) (2 diffs, 1 prop)

trunk/LMDZ.TITAN/libf/dynphy_lonlat/inigeomphy_mod.F90

@@ -73 +73 @@
   REAL,ALLOCATABLE,SAVE :: boundslonfi(:,:)
   REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
-!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
+  INTEGER,ALLOCATABLE,SAVE :: ind_cell_glo_fi(:)
+!$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi,ind_cell_glo_fi)
 
   ! Initialize Physics distibution and parameters and interface with dynamics
@@ -201 +202 @@
   ALLOCATE(boundslonfi(klon_omp,4))
   ALLOCATE(boundslatfi(klon_omp,4))
-!  CALL initcomgeomphy
+  ALLOCATE(ind_cell_glo_fi(klon_omp))
+
 
   offset = klon_mpi_begin - 1
@@ -211 +213 @@
   boundslonfi(1:klon_omp,:) = boundslonfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:)
   boundslatfi(1:klon_omp,:) = boundslatfi_glo(offset+klon_omp_begin:offset+klon_omp_end,:)
+  ind_cell_glo_fi(1:klon_omp)=(/ (i,i=offset+klon_omp_begin,offset+klon_omp_end) /)
 
   ! copy over local grid longitudes and latitudes
   CALL init_geometry(klon_omp,lonfi,latfi,boundslonfi,boundslatfi, &
-                     airefi,cufi,cvfi)
+                     airefi,ind_cell_glo_fi,cufi,cvfi)
 
   ! copy over preff , ap(), bp(), etc 

trunk/LMDZ.TITAN/libf/dynphy_lonlat/mod_interface_dyn_phys.F90

@@ -22 +22 @@
     
     k=1
-    IF (is_north_pole) THEN
+    IF (is_north_pole_dyn) THEN
       index_i(k)=1
       index_j(k)=1
@@ -42 +42 @@
     ENDDO
     
-    IF (is_south_pole) THEN
+    IF (is_south_pole_dyn) THEN
       index_i(k)=1
       index_j(k)=jj_end