Changeset 4775

Timestamp:

Dec 15, 2023, 12:38:51 PM (5 months ago)

Author:

idelkadi

Message:

Correction: update of phylmdiso following modifications linked to the implementation of the double call of Ecrad

Location:

LMDZ6/trunk/libf/phylmdiso

Files:

• phys_output_var_mod.F90 (modified) (3 diffs)
• physiq_mod.F90 (modified) (9 diffs)

LMDZ6/trunk/libf/phylmdiso/phys_output_var_mod.F90

@@ -177 +177 @@
   !$OMP THREADPRIVATE(tkt, tks, taur, sss)
 
+  !AI. cloud_cover_sw, cloud_cover_sw_s2 from Ecrad (1rt and 2 call)
+  REAL, SAVE, ALLOCATABLE:: cloud_cover_sw(:), cloud_cover_sw_s2(:)
+  !$OMP THREADPRIVATE(cloud_cover_sw, cloud_cover_sw_s2)
+
 CONTAINS
 
@@ -253 +257 @@
     ALLOCATE(icc3dstra(klon, klev))
 
+    ! cloud_cover_sw, cloud_cover_sw_s2 from Ecrad
+    ALLOCATE(cloud_cover_sw(klon))
+    ALLOCATE(cloud_cover_sw_s2(klon))
+
   END SUBROUTINE phys_output_var_init
 
@@ -304 +312 @@
     DEALLOCATE(icc3dstra)
 
+    !AI cloud_cover_sw, cloud_cover_sw_s2 from Ecrad
+    DEALLOCATE(cloud_cover_sw, cloud_cover_sw_s2)
+
   END SUBROUTINE phys_output_var_end
 

LMDZ6/trunk/libf/phylmdiso/physiq_mod.F90

@@ -92 +92 @@
     USE lmdz_cloud_optics_prop_ini, ONLY : cloud_optics_prop_ini
     USE phys_output_var_mod, ONLY :      cloudth_sth,cloudth_senv,cloudth_sigmath,cloudth_sigmaenv
-
+    USE phys_output_var_mod, ONLY : cloud_cover_sw, cloud_cover_sw_s2
 
     !USE cmp_seri_mod
@@ -1342 +1342 @@
     INTEGER ieru
 
+    !AI namelist pour gerer le double appel de Ecrad
+    CHARACTER(len=512) :: namelist_ecrad_file
+
     pi = 4. * ATAN(1.)
 
@@ -1579 +1582 @@
        WRITE(lunout,*) 'Call to infocfields from physiq'
        CALL infocfields_init
+
+#ifdef CPP_ECRAD
+       ok_3Deffect=.false.
+       CALL getin_p('ok_3Deffect',ok_3Deffect)
+       namelist_ecrad_file='namelist_ecrad'
+#endif
 
     ENDIF
@@ -5769 +5778 @@
           ENDIF
           !
+          ! AI namelist utilise pour l appel principal de radlwsw (ecrad)
+          namelist_ecrad_file='namelist_ecrad'
+          !
           CALL radlwsw &
                (dist, rmu0, fract,  &
@@ -5787 +5799 @@
                zqsat, flwc, fiwc, &
                ref_liq, ref_ice, ref_liq_pi, ref_ice_pi, &
+               namelist_ecrad_file, &
                heat,heat0,cool,cool0,albpla, &
                heat_volc,cool_volc, &
@@ -5806 +5819 @@
                                 !-end
                ZLWFT0_i, ZFLDN0, ZFLUP0, &
-               ZSWFT0_i, ZFSDN0, ZFSUP0)
+               ZSWFT0_i, ZFSDN0, ZFSUP0, &
+               cloud_cover_sw)
 
           !lwoff=y, betalwoff=1. : offset LW CRE for radiation code and other
@@ -5843 +5857 @@
                 ENDIF
                 !
+                ! AI namelist utilise pour l appel principal de radlwsw (ecrad)
+                namelist_ecrad_file='namelist_ecrad'
+                !
                 CALL radlwsw &
                      (dist, rmu0, fract,  &
@@ -5861 +5878 @@
                      zqsat, flwc, fiwc, &
                      ref_liq, ref_ice, ref_liq_pi, ref_ice_pi, &
+                     namelist_ecrad_file, &
                      heatp,heat0p,coolp,cool0p,albplap, &
                      heat_volc,cool_volc, &
@@ -5880 +5898 @@
                                 !-end
                      ZLWFT0_i, ZFLDN0, ZFLUP0, &
-                     ZSWFT0_i, ZFSDN0, ZFSUP0)
+                     ZSWFT0_i, ZFSDN0, ZFSUP0, &
+                     cloud_cover_sw)
           ENDIF !ok_4xCO2atm
        ENDIF ! aerosol_couple