Changeset 3433 for LMDZ5

Timestamp:

Jan 21, 2019, 3:03:51 PM (5 years ago)

Author:

acozic

Message:

merge with rev 3418 of trunk - add modification to take into account values read in INCA restart file

Location:

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd

Files:

• physiq_mod.F90 (modified) (3 diffs)
• phytrac_mod.F90 (modified) (3 diffs)

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/physiq_mod.F90

@@ -1076 +1076 @@
     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
+
     INTEGER :: nbtr_tmp ! Number of tracer inside concvl
     REAL, dimension(klon,klev) :: sh_in ! Specific humidity entering in phytrac
@@ -1591 +1600 @@
                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)
@@ -4294 +4314 @@
          rfname, &
          d_tr_dyn, &                                 !<<RomP
-         tr_seri)
+         tr_seri, init_source)
 
     IF (offline) THEN

LMDZ5/branches/IPSLCM5A2.1/libf/phylmd/phytrac_mod.F90

@@ -77 +77 @@
        rfname,                                        &
        d_tr_dyn,                                      &   ! RomP
-       tr_seri)         
+       tr_seri, init_source)         
     !
     !======================================================================
@@ -239 +239 @@
     REAL,DIMENSION(klon,nbsrf),INTENT(IN) :: pctsrf ! Pourcentage de sol (nature du sol)
 
+    REAL, DIMENSION(klon,nbtr), INTENT(IN) :: init_source
 
     ! Output argument
@@ -453 +454 @@
           CALL traclmdz_init(pctsrf,xlat,xlon,ftsol,tr_seri,t_seri,pplay,sh,pdtphys,aerosol,lessivage)
        CASE('inca')
-          source(:,:)=0.
+          source(:,:)=init_source(:,:) 
           CALL tracinca_init(aerosol,lessivage)
        CASE('repr')