Changeset 2457

Timestamp:

Mar 3, 2016, 5:14:54 PM (9 years ago)

Author:

acozic

Message:

make some modification to allow ce0l to compile with INCA (and so add tracers in start.nc)

Location:

LMDZ5/trunk/libf/dynphy_lonlat/phylmd

Files:

• ce0l.F90 (modified) (2 diffs)
• iniphysiq_mod.F90 (modified) (3 diffs)

LMDZ5/trunk/libf/dynphy_lonlat/phylmd/ce0l.F90

@@ -27 +27 @@
   USE iniphysiq_mod,  ONLY: iniphysiq
   USE mod_const_mpi,  ONLY: comm_lmdz
-#ifdef inca
-  USE indice_sol_mod, ONLY: nbsrf, is_oce, is_sic, is_ter, is_lic
-#endif
 #ifdef CPP_PARA
   USE mod_const_mpi,  ONLY: init_const_mpi
-  USE parallel_lmdz,  ONLY: init_parallel, mpi_rank, omp_rank, mpi_size
+  USE parallel_lmdz,  ONLY: init_parallel, mpi_rank, omp_rank
   USE bands,          ONLY: read_distrib, distrib_phys
   USE mod_hallo,      ONLY: init_mod_hallo
@@ -116 +113 @@
 
 !--- Tracers initializations
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-    CALL init_const_lmdz(nbtr,anneeref,dayref,iphysiq,day_step,nday,&
-                         nbsrf,is_oce,is_sic,is_ter,is_lic,calend)
-    CALL init_inca_para(iim,jjp1,llm,klon_glo,mpi_size,distrib_phys,&
-                        COMM_LMDZ)
-    WRITE(lunout,*)'nbtr =' , nbtr 
-#endif
-  END IF
   CALL infotrac_init()
 

LMDZ5/trunk/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