Changeset 4743 for LMDZ6/branches/Portage_acc/libf/phylmd/phys_state_var_mod.F90

Timestamp:

Oct 30, 2023, 5:37:00 PM (7 months ago)

Author:

Laurent Fairhead

Message:

Merge of ACC branch with 4740 revision from trunk

Location:

LMDZ6/branches/Portage_acc

Files:

• . (modified) (1 prop)
• libf/phylmd/phys_state_var_mod.F90 (modified) (12 diffs)

LMDZ6/branches/Portage_acc/libf/phylmd/phys_state_var_mod.F90

@@ -102 +102 @@
       REAL, ALLOCATABLE, SAVE :: rneb_ancien(:,:)
 !$OMP THREADPRIVATE(rneb_ancien)
-      REAL, ALLOCATABLE, SAVE :: qtc_cv(:,:),sigt_cv(:,:)
-!$OMP THREADPRIVATE(qtc_cv,sigt_cv)
+      REAL, ALLOCATABLE, SAVE :: qtc_cv(:,:),sigt_cv(:,:),detrain_cv(:,:),fm_cv(:,:)
+!$OMP THREADPRIVATE(qtc_cv,sigt_cv,detrain_cv,fm_cv)
       REAL, ALLOCATABLE, SAVE :: ratqs(:,:)
 !$OMP THREADPRIVATE(ratqs)
@@ -229 +229 @@
 !$OMP THREADPRIVATE(ftd)
 ! fqd : convective moistening due to unsaturated downdraughts
-      REAL,ALLOCATABLE,SAVE :: fqd(:,:)     
-!$OMP THREADPRIVATE(fqd)
+      REAL,ALLOCATABLE,SAVE :: fqd(:,:),fqcomp(:,:)     
+!$OMP THREADPRIVATE(fqd,fqcomp)
 #ifdef ISO
       REAL, ALLOCATABLE, SAVE :: fxtd(:,:,:)
@@ -401 +401 @@
 !$OMP THREADPRIVATE(swdnc0p, swdn0p, swdnp, swupc0p, swup0p, swupp)
 
+!AI ajout variables double appel Ecrad (3Deffect)
+      REAL,ALLOCATABLE,SAVE :: heat_s2(:,:), cool_s2(:,:)
+!$OMP THREADPRIVATE(heat_s2, cool_s2)
+      REAL,ALLOCATABLE,SAVE :: heat0_s2(:,:), cool0_s2(:,:)
+!$OMP THREADPRIVATE(heat0_s2, cool0_s2)
+      REAL,ALLOCATABLE,SAVE :: radsol_s2(:), topsw_s2(:), toplw_s2(:)
+!$OMP THREADPRIVATE(radsol_s2, topsw_s2, toplw_s2)
+      REAL,ALLOCATABLE,SAVE :: albpla_s2(:)
+!$OMP THREADPRIVATE(albpla_s2)
+      REAL,ALLOCATABLE,SAVE :: solsw_s2(:), solswfdiff_s2(:), sollw_s2(:)
+!$OMP THREADPRIVATE(solsw_s2, solswfdiff_s2, sollw_s2)
+      REAL,ALLOCATABLE,SAVE :: sollwdown_s2(:)
+!$OMP THREADPRIVATE(sollwdown_s2)
+      REAL,ALLOCATABLE,SAVE :: topsw0_s2(:),toplw0_s2(:)
+      REAL,ALLOCATABLE,SAVE :: solsw0_s2(:),sollw0_s2(:)
+!$OMP THREADPRIVATE(topsw0_s2,toplw0_s2,solsw0_s2,sollw0_s2)
+      REAL,ALLOCATABLE,SAVE :: lwdnc0_s2(:,:), lwdn0_s2(:,:), lwdn_s2(:,:)
+      REAL,ALLOCATABLE,SAVE :: lwupc0_s2(:,:), lwup0_s2(:,:), lwup_s2(:,:)
+!$OMP THREADPRIVATE(lwdnc0_s2,lwdn0_s2,lwdn_s2,lwupc0_s2,lwup0_s2,lwup_s2)       
+      REAL,ALLOCATABLE,SAVE :: swdnc0_s2(:,:), swdn0_s2(:,:), swdn_s2(:,:)
+      REAL,ALLOCATABLE,SAVE :: swupc0_s2(:,:), swup0_s2(:,:), swup_s2(:,:)
+!$OMP THREADPRIVATE(swdnc0_s2, swdn0_s2, swdn_s2, swupc0_s2, swup0_s2, swup_s2)
+
 ! pbase : cloud base pressure
 ! bbase : cloud base buoyancy
@@ -456 +479 @@
 !$OMP THREADPRIVATE(ale_bl_trig)
 
-      REAL,SAVE,ALLOCATABLE :: ratqs_inter(:,:)
-!$OMP THREADPRIVATE(ratqs_inter)
+      REAL,SAVE,ALLOCATABLE :: ratqs_inter_(:,:)
+!$OMP THREADPRIVATE(ratqs_inter_)
 
 #ifdef ISO
@@ -569 +592 @@
       ALLOCATE(clwcon(klon,klev),rnebcon(klon,klev))
       ALLOCATE(rneb_ancien(klon,klev))
-      ALLOCATE(qtc_cv(klon,klev),sigt_cv(klon,klev))
+      ALLOCATE(qtc_cv(klon,klev),sigt_cv(klon,klev),detrain_cv(klon,klev),fm_cv(klon,klev))
       ALLOCATE(ratqs(klon,klev))
       ALLOCATE(pbl_tke(klon,klev+1,nbsrf+1))
@@ -640 +663 @@
       ALLOCATE(sigd(klon))
       ALLOCATE(cin(klon), ALE(klon), ALP(klon))
-      ALLOCATE(ftd(klon,klev), fqd(klon,klev))
+      ALLOCATE(ftd(klon,klev), fqd(klon,klev),fqcomp(klon,klev))
       ALLOCATE(Ale_bl(klon))
       ALLOCATE(ale_wake(klon))
@@ -700 +723 @@
       ALLOCATE(swupc0p(klon,klevp1), swup0p(klon,klevp1), swupp(klon,klevp1))
 
+!AI Ajout pour Ecrad (3Deffect)       
+      ALLOCATE(heat_s2(klon,klev), cool_s2(klon,klev))
+      ALLOCATE(heat0_s2(klon,klev), cool0_s2(klon,klev))
+      ALLOCATE(radsol_s2(klon), topsw_s2(klon), toplw_s2(klon))
+      ALLOCATE(albpla_s2(klon))
+      ALLOCATE(solsw_s2(klon), solswfdiff_s2(klon), sollw_s2(klon))
+      ALLOCATE(sollwdown_s2(klon))
+      ALLOCATE(topsw0_s2(klon),toplw0_s2(klon))
+      ALLOCATE(solsw0_s2(klon),sollw0_s2(klon))
+      ALLOCATE(lwdnc0_s2(klon,klevp1), lwdn0_s2(klon,klevp1), lwdn_s2(klon,klevp1))
+      ALLOCATE(lwupc0_s2(klon,klevp1), lwup0_s2(klon,klevp1), lwup_s2(klon,klevp1))
+      ALLOCATE(swdnc0_s2(klon,klevp1), swdn0_s2(klon,klevp1), swdn_s2(klon,klevp1))
+      ALLOCATE(swupc0_s2(klon,klevp1), swup0_s2(klon,klevp1), swup_s2(klon,klevp1))
+
       ALLOCATE(cape(klon))
       ALLOCATE(pbase(klon),bbase(klon))
@@ -735 +772 @@
 
       ALLOCATE(ale_bl_trig(klon))
-      ALLOCATE(ratqs_inter(klon,klev))
+      ALLOCATE(ratqs_inter_(klon,klev))
       IF (ok_gwd_rando) THEN
         ALLOCATE(du_gwd_rando(klon, klev))
@@ -775 +812 @@
       DEALLOCATE(qs_ancien, ql_ancien, qbs_ancien, rneb_ancien)
       DEALLOCATE(prw_ancien, prlw_ancien, prsw_ancien, prbsw_ancien)
-      DEALLOCATE(qtc_cv,sigt_cv)
+      DEALLOCATE(qtc_cv,sigt_cv,detrain_cv,fm_cv)
       DEALLOCATE(u_ancien, v_ancien)
       DEALLOCATE(tr_ancien)                           !RomP
@@ -823 +860 @@
       DEALLOCATE(wd, sigd)
       DEALLOCATE(cin, ALE, ALP)
-      DEALLOCATE(ftd, fqd)
+      DEALLOCATE(ftd, fqd, fqcomp)
       DEALLOCATE(Ale_bl, Alp_bl)
       DEALLOCATE(ale_wake)
@@ -858 +895 @@
       DEALLOCATE(topsw0,toplw0,solsw0,sollw0)
       DEALLOCATE(albpla)
+
+!AI Ajout pour Ecrad (3Deffect)
+      DEALLOCATE(heat_s2, cool_s2)
+      DEALLOCATE(heat0_s2, cool0_s2)
+      DEALLOCATE(radsol_s2, topsw_s2, toplw_s2)
+      DEALLOCATE(albpla_s2)
+      DEALLOCATE(solsw_s2, solswfdiff_s2, sollw_s2)
+      DEALLOCATE(sollwdown_s2)
+      DEALLOCATE(topsw0_s2,toplw0_s2)
+      DEALLOCATE(solsw0_s2,sollw0_s2)
+      DEALLOCATE(lwdnc0_s2, lwdn0_s2, lwdn_s2)
+      DEALLOCATE(lwupc0_s2, lwup0_s2, lwup_s2)
+      DEALLOCATE(swdnc0_s2, swdn0_s2, swdn_s2)
+      DEALLOCATE(swupc0_s2, swup0_s2, swup_s2)
+
 !IM ajout variables CFMIP2/CMIP5
       DEALLOCATE(heatp, coolp)
@@ -888 +940 @@
       if (.not. ok_hines .and. ok_gwd_rando) DEALLOCATE(du_gwd_front)
       DEALLOCATE(ale_bl_trig)
-      DEALLOCATE(ratqs_inter)
+      DEALLOCATE(ratqs_inter_)
 
       if (activate_ocean_skin >= 1) then