Changeset 3820 for LMDZ6/branches/LMDZ-INCA-Dyn

Timestamp:

Feb 4, 2021, 3:59:25 PM (4 years ago)

Author:

lmdz-users

Message:

to be able to work with dynamico's dynamic, we modify call for the inca initialisation

Location:

LMDZ6/branches/LMDZ-INCA-Dyn/libf

Files:

• dynphy_lonlat/phylmd/iniphysiq_mod.F90 (modified) (2 diffs)
• phy_common/mod_phys_lmdz_mpi_data.F90 (modified) (3 diffs)
• phy_common/mod_phys_lmdz_para.F90 (modified) (1 diff)
• phy_common/physics_distribution_mod.F90 (modified) (2 diffs)
• phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ6/branches/LMDZ-INCA-Dyn/libf/dynphy_lonlat/phylmd/iniphysiq_mod.F90

@@ -172 +172 @@
 !$OMP END PARALLEL
 
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-     call init_const_lmdz( &
-          anneeref,dayref, iphysiq,day_step,nday,  &
-          nbsrf, is_oce,is_sic, is_ter,is_lic, calend, &
-          config_inca)
-     call init_inca_para( &
-          nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
-          distrib_phys,communicator)
-#endif
-  END IF
   IF (type_trac == 'repr') THEN
 #ifdef REPROBUS
@@ -198 +187 @@
   END IF
 
-  IF (type_trac == 'inca') THEN
-#ifdef INCA
-     CALL init_inca_dim(klon_omp,nbp_lev,nbp_lon,nbp_lat - 1, &
-          rlonudyn,rlatudyn,rlonvdyn,rlatvdyn)
-#endif
-    IF (type_trac == 'repr') THEN
-#ifdef REPROBUS
-       CALL Init_chem_rep_phys(klon_omp,nbp_lev)
-#endif
-    END IF
-  END IF
-
 !$OMP END PARALLEL
 

LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/mod_phys_lmdz_mpi_data.F90

@@ -46 +46 @@
 CONTAINS
   
-  SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, communicator)
+  SUBROUTINE init_phys_lmdz_mpi_data(nbp, nbp_lon, nbp_lat, nbp_lev, communicator)
+
+    USE infotrac, ONLY: type_trac
+
   IMPLICIT NONE
 #ifdef CPP_MPI
@@ -54 +57 @@
     INTEGER,INTENT(IN) :: nbp_lon
     INTEGER,INTENT(IN) :: nbp_lat
+    INTEGER,INTENT(IN) :: nbp_lev
     INTEGER,INTENT(IN) :: communicator
     
@@ -179 +183 @@
    
     CALL Print_module_data
+
+    IF (type_trac == 'inca') THEN
+#ifdef INCA
+       CALL init_inca_para( &
+            nbp_lon,nbp_lat,nbp_lev,klon_glo,mpi_size, &
+            distrib,communicator)
+#endif
+    ENDIF
     
   END SUBROUTINE Init_phys_lmdz_mpi_data

LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/mod_phys_lmdz_para.F90

@@ -17 +17 @@
 CONTAINS
 
-  SUBROUTINE Init_phys_lmdz_para(nbp,nbp_lon,nbp_lat,communicator)
+  SUBROUTINE Init_phys_lmdz_para(nbp,nbp_lon,nbp_lat,nbp_lev,communicator)
   IMPLICIT NONE
     INTEGER,INTENT(in) :: nbp
     INTEGER,INTENT(in) :: nbp_lon
     INTEGER,INTENT(in) :: nbp_lat
+    INTEGER,INTENT(in) :: nbp_lev
     INTEGER,INTENT(in) :: communicator
 
-    CALL Init_phys_lmdz_mpi_data(nbp,nbp_lon,nbp_lat,communicator)
+    CALL Init_phys_lmdz_mpi_data(nbp,nbp_lon,nbp_lat,nbp_lev,communicator)
 !$OMP PARALLEL
     CALL Init_phys_lmdz_omp_data(klon_mpi)

LMDZ6/branches/LMDZ-INCA-Dyn/libf/phy_common/physics_distribution_mod.F90

@@ -29 +29 @@
 
     CALL init_grid_phy_lmdz(grid_type,nvertex, nbp_lon,nbp_lat,nbp_lev)
-    CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat, communicator)
+    CALL init_phys_lmdz_para(nbp,nbp_lon, nbp_lat,nbp_lev, communicator)
 !$OMP PARALLEL
     CALL init_dimphy(klon_omp,nbp_lev)
@@ -37 +37 @@
 #ifdef REPROBUS
        CALL Init_chem_rep_phys(klon_omp,nbp_lev)
+#endif
+    END IF
+    IF (type_trac == 'inca') THEN
+#ifdef INCA
+       CALL Init_inca_dim(klon_omp,nbp_lev)
 #endif
     END IF

LMDZ6/branches/LMDZ-INCA-Dyn/libf/phylmd/physiq_mod.F90

@@ -34 +34 @@
     USE FLOTT_GWD_rando_m, only: FLOTT_GWD_rando
     USE fonte_neige_mod, ONLY  : fonte_neige_get_vars
-    USE geometry_mod, ONLY: cell_area, latitude_deg, longitude_deg
+    USE geometry_mod
     USE ioipsl, only: histbeg, histvert, histdef, histend, histsync, &
          histwrite, ju2ymds, ymds2ju, getin
@@ -53 +53 @@
     USE phystokenc_mod, ONLY: offline, phystokenc
     USE phys_cal_mod, only: year_len, mth_len, days_elapsed, jh_1jan, &
-         year_cur, mth_cur,jD_cur, jH_cur, jD_ref, day_cur, hour
+         year_cur, mth_cur,jD_cur, jH_cur, jD_ref, day_cur, hour, calend
 !!  USE phys_local_var_mod, ONLY : a long list of variables
 !!              ==> see below, after "CPP Keys" section
@@ -67 +67 @@
     USE surface_data,     ONLY : type_ocean, ok_veget, landice_opt
     USE time_phylmdz_mod, only: annee_ref, current_time, day_ini, day_ref, &
-          day_step_phy, itau_phy, pdtphys, raz_date, start_time, update_time
+          day_step_phy, itau_phy, pdtphys, raz_date, start_time, update_time, ndays
     USE tracinca_mod, ONLY: config_inca
     USE tropopause_m,     ONLY: dyn_tropopause
@@ -1944 +1944 @@
           calday = REAL(days_elapsed) + jH_cur
           WRITE(lunout,*) 'initial time chemini', days_elapsed, calday
+
+          call init_const_lmdz( &
+          ndays, nbsrf, is_oce,is_sic, is_ter,is_lic, calend, &
+          config_inca)
+
 
           CALL chemini(  &