Changeset 5173

Timestamp:

Sep 9, 2024, 11:01:27 AM (4 months ago)

Author:

abarral

Message:

Merge r5169

Location:

LMDZ6/branches/Amaury_dev/libf

Files:

• phylmd/physiq_mod.F90 (modified) (1 diff)
• phylmdiso/physiq_mod.F90 (modified) (1 diff)

LMDZ6/branches/Amaury_dev/libf/phylmd/physiq_mod.F90

@@ -1758 +1758 @@
 
         IF (CPPKEY_COSPV2) THEN
-          CALL lmdz_cosp_interface(itap, phys_tstep, freq_cosp, &
-                  ok_mensuelCOSP, ok_journeCOSP, ok_hfCOSP, &
-                  ecrit_mth, ecrit_day, ecrit_hf, ok_all_xml, missing_val, &
-                  klon, klev, longitude_deg, latitude_deg, presnivs, overlap, &
-                  JrNt, ref_liq, ref_ice, &
-                  pctsrf(:, is_ter) + pctsrf(:, is_lic), &
-                  zu10m, zv10m, pphis, &
-                  phicosp, paprs(:, 1:klev), pplay, zxtsol, t_seri, &
-                  qx(:, :, ivap), zx_rh, cldfra, rnebcon, flwc, fiwc, &
-                  prfl(:, 1:klev), psfl(:, 1:klev), &
-                  pmflxr(:, 1:klev), pmflxs(:, 1:klev), &
-                  mr_ozone, cldtau, cldemi)
+          CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
+               zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
+               fiwc_cosp0,prfl_cosp0,psfl_cosp0,pmflxr_cosp0,pmflxs_cosp0, &
+               mr_ozone_cosp0,cldtau_cosp0,cldemi_cosp0,JrNt_cosp0)
+
+          CALL lmdz_cosp_interface(itap,phys_tstep,freq_cosp, &
+               ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
+               ecrit_mth,ecrit_day,ecrit_hf, ok_all_xml, missing_val, &
+               klon,klev,longitude_deg,latitude_deg,presnivs,overlap, &
+               JrNt_cosp0,ref_liq_cosp0,ref_ice_cosp0, &
+               pctsrf_cosp0, &
+               zu10m_cosp0,zv10m_cosp0,pphis, &
+               pphi,paprs(:,1:klev),pplay,zxtsol_cosp0,t, &
+               qx(:,:,ivap),zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0,fiwc_cosp0, &
+               prfl_cosp0(:,1:klev),psfl_cosp0(:,1:klev), &
+               pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
+               mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
         END IF
       END IF

LMDZ6/branches/Amaury_dev/libf/phylmdiso/physiq_mod.F90

@@ -1944 +1944 @@
 
 IF (CPPKEY_COSPV2) THEN
+  CALL ini_COSP(ref_liq_cosp0,ref_ice_cosp0,pctsrf_cosp0,zu10m_cosp0,zv10m_cosp0, &
+               zxtsol_cosp0,zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0, &
+               fiwc_cosp0,prfl_cosp0,psfl_cosp0,pmflxr_cosp0,pmflxs_cosp0, &
+               mr_ozone_cosp0,cldtau_cosp0,cldemi_cosp0,JrNt_cosp0)
+
           CALL lmdz_cosp_interface(itap,phys_tstep,freq_cosp, &
                ok_mensuelCOSP,ok_journeCOSP,ok_hfCOSP, &
                ecrit_mth,ecrit_day,ecrit_hf, ok_all_xml, missing_val, &
                klon,klev,longitude_deg,latitude_deg,presnivs,overlap, &
-               JrNt,ref_liq,ref_ice, &
-               pctsrf(:,is_ter)+pctsrf(:,is_lic), &
-               zu10m,zv10m,pphis, &
-               phicosp,paprs(:,1:klev),pplay,zxtsol,t_seri, &
-               qx(:,:,ivap),zx_rh,cldfra,rnebcon,flwc,fiwc, &
-               prfl(:,1:klev),psfl(:,1:klev), &
-               pmflxr(:,1:klev),pmflxs(:,1:klev), &
-               mr_ozone,cldtau, cldemi)
+               JrNt_cosp0,ref_liq_cosp0,ref_ice_cosp0, &
+               pctsrf_cosp0, &
+               zu10m_cosp0,zv10m_cosp0,pphis, &
+               pphi,paprs(:,1:klev),pplay,zxtsol_cosp0,t, &
+               qx(:,:,ivap),zx_rh_cosp0,cldfra_cosp0,rnebcon_cosp0,flwc_cosp0,fiwc_cosp0, &
+               prfl_cosp0(:,1:klev),psfl_cosp0(:,1:klev), &
+               pmflxr_cosp0(:,1:klev),pmflxs_cosp0(:,1:klev), &
+               mr_ozone_cosp0,cldtau_cosp0, cldemi_cosp0)
 END IF
       ENDIF