Changeset 2471 for LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

Timestamp:

Mar 18, 2016, 12:09:23 PM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2434:2457 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (3 diffs)

LMDZ5/branches/testing/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -47 +47 @@
 #ifdef INCA
   USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
-  USE parallel_lmdz, ONLY : mpi_size
-  USE mod_const_mpi, ONLY : COMM_LMDZ
+#ifdef CPP_PARA
+  USE parallel_lmdz, ONLY : mpi_size, mpi_rank
   USE bands, ONLY : distrib_phys
+#endif
   USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
 #endif
@@ -115 +116 @@
   REAL,ALLOCATABLE,SAVE :: boundslatfi(:,:)
 !$OMP THREADPRIVATE (latfi,lonfi,cufi,cvfi,airefi,boundslonfi,boundslatfi)
+
+#ifndef CPP_PARA
+  INTEGER,PARAMETER :: mpi_rank=0
+  INTEGER, PARAMETER :: mpi_size = 1 
+  INTEGER :: distrib_phys(mpi_rank:mpi_rank)=(jjm-1)*iim+2
+#endif
 
   ! Initialize Physics distibution and parameters and interface with dynamics
@@ -295 +302 @@
 #ifdef INCA
      call init_const_lmdz( &
-          anneeref,dayref, &
-          iphysiq,day_step,nday,  &
-          nbsrf, is_oce,is_sic, &
-          is_ter,is_lic, calend)
+          anneeref,dayref, iphysiq,day_step,nday,  &
+          nbsrf, is_oce,is_sic, is_ter,is_lic, calend)
      call init_inca_para( &
           nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
-          distrib_phys,COMM_LMDZ)
+          distrib_phys,communicator)
 #endif
   END IF