Changeset 2408 for LMDZ5/branches/testing/libf/dyn3dmem/gcm.F90

Timestamp:

Dec 14, 2015, 11:43:09 AM (9 years ago)

Author:

Laurent Fairhead

Message:

Merged trunk changes r2298:2396 into testing branch

Location:

LMDZ5/branches/testing

Files:

• . (modified) (1 prop)
• libf/dyn3dmem/gcm.F90 (modified) (6 diffs)

LMDZ5/branches/testing/libf/dyn3dmem/gcm.F90

@@ -10 +10 @@
   USE parallel_lmdz
   USE infotrac
-#ifdef CPP_PHYS
-  USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
-#endif
+!#ifdef CPP_PHYS
+!  USE mod_interface_dyn_phys, ONLY: init_interface_dyn_phys
+!#endif
   USE mod_hallo
   USE Bands
@@ -18 +18 @@
   USE control_mod
 
-#ifdef INCA
-  ! Only INCA needs these informations (from the Earth's physics)
-  USE indice_sol_mod
-  USE mod_phys_lmdz_omp_data, ONLY: klon_omp 
-#endif
-
 #ifdef CPP_PHYS
-  !      USE mod_grid_phy_lmdz
-  !      USE mod_phys_lmdz_para, ONLY : klon_mpi_para_nb
-  !      USE dimphy
-  !      USE comgeomphy
+  USE iniphysiq_mod, ONLY: iniphysiq
 #endif
   IMPLICIT NONE
@@ -76 +67 @@
   include "tracstoke.h"
 
-#ifdef INCA
-  ! Only INCA needs these informations (from the Earth's physics)
-  !include "indicesol.h"
-#endif
 
   REAL zdtvr
@@ -155 +142 @@
   call Read_Distrib
 
-#ifdef CPP_PHYS
-  CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
+!#ifdef CPP_PHYS
+!  CALL Init_Phys_lmdz(iim,jjp1,llm,mpi_size,distrib_phys)
   !#endif
   !      CALL set_bands
   !#ifdef CPP_PHYS
-  CALL Init_interface_dyn_phys
-#endif
+!  CALL Init_interface_dyn_phys
+!#endif
   CALL barrier
 
@@ -200 +187 @@
 #endif
 
-  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,jjm+1,llm,klon_glo,mpi_size, &
-          distrib_phys,COMM_LMDZ)
-#endif
-  END IF
 
   !-----------------------------------------------------------------------
@@ -400 +374 @@
      ! Physics:
 #ifdef CPP_PHYS
-     CALL iniphysiq(iim,jjm,llm,daysec,day_ini,dtphys/nsplit_phys, &
-          rlatu,rlonv,aire,cu,cv,rad,g,r,cpp, &
+     CALL iniphysiq(iim,jjm,llm, &
+          distrib_phys(mpi_rank),comm_lmdz, &
+          daysec,day_ini,dtphys/nsplit_phys, &
+          rlatu,rlatv,rlonu,rlonv,aire,cu,cv,rad,g,r,cpp, &
           iflag_phys)
 #endif
   ENDIF ! of IF ((iflag_phys==1).or.(iflag_phys>=100))
 
-
-  !-----------------------------------------------------------------------
-  !   Initialisation des dimensions d'INCA :
-  !   --------------------------------------
-  IF (type_trac == 'inca') THEN
-     !$OMP PARALLEL
-#ifdef INCA
-     CALL init_inca_dim(klon_omp,llm,iim,jjm, &
-          rlonu,rlatu,rlonv,rlatv)
-#endif
-     !$OMP END PARALLEL
-  END IF
 
   !-----------------------------------------------------------------------