Changeset 3419 for LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90

Timestamp:

Dec 6, 2018, 1:58:51 PM (6 years ago)

Author:

acozic

Message:

merge with rev 3418 of trunk

File:

• LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90 (modified) (4 diffs)

LMDZ6/branches/IPSLCM6.0.15/libf/phylmd/physiq_mod.F90

@@ -1143 +1143 @@
     REAL, dimension(klon, klev) :: cldfrarad   ! fraction nuageuse
 
+#ifdef INCA
+    ! set de variables utilisees pour l'initialisation des valeurs provenant de INCA
+    REAL, DIMENSION(klon,klev,naero_grp,nbands) :: init_tauinca
+    REAL, DIMENSION(klon,klev,naero_grp,nbands) :: init_pizinca
+    REAL, DIMENSION(klon,klev,naero_grp,nbands) :: init_cginca
+    REAL, DIMENSION(klon,klev,nbands) :: init_ccminca
+#endif
+    REAL, DIMENSION(klon,nbtr) :: init_source
+
+
     !lwoff=y : offset LW CRE for radiation code and other schemes
     REAL, SAVE :: betalwoff 
@@ -1342 +1352 @@
 
        IF (type_trac == 'inca') THEN
-          ! jg : initialisation jusqu'au ces variables sont dans restart
-          ccm(:,:,:) = 0.
-          tau_aero(:,:,:,:) = 0.
-          piz_aero(:,:,:,:) = 0.
-          cg_aero(:,:,:,:) = 0.
 
           config_inca='none' ! default
@@ -1758 +1763 @@
                io_lon, &
                io_lat, &
-               chemistry_couple)
+               chemistry_couple, &
+               init_source, &
+               init_tauinca, &
+               init_pizinca, &
+               init_cginca, &
+               init_ccminca)
+
+          ! initialisation des variables depuis le restart de inca
+          ccm(:,:,:) = init_ccminca
+          tau_aero(:,:,:,:) = init_tauinca
+          piz_aero(:,:,:,:) = init_pizinca
+          cg_aero(:,:,:,:) = init_cginca
+
 
           CALL VTe(VTinca)
@@ -4517 +4534 @@
          rfname, &
          d_tr_dyn, &                                 !<<RomP
-         tr_seri)
+         tr_seri, init_source)
 #endif
     ENDIF    ! (iflag_phytrac=1)