Changeset 4088 for LMDZ6

Timestamp:

Mar 10, 2022, 8:03:20 AM (3 years ago)

Author:

fhourdin

Message:

Correction isotopes + version identique sur phylmd

Location:

LMDZ6/trunk/libf

Files:

• phylmd/phys_state_var_mod.F90 (modified) (9 diffs)
• phylmdiso/phys_state_var_mod.F90 (modified) (3 diffs)

LMDZ6/trunk/libf/phylmd/phys_state_var_mod.F90

@@ -62 +62 @@
       REAL, ALLOCATABLE, SAVE :: swradcorr(:)
 !$OMP THREADPRIVATE(swradcorr)
+#ifdef ISO
+      REAL,ALLOCATABLE,SAVE :: xtsol(:,:),fxtevap(:,:,:)
+!$OMP THREADPRIVATE(xtsol,fxtevap)
+      REAL, ALLOCATABLE, SAVE :: xtrain_fall(:,:), xtsnow_fall(:,:)
+!$OMP THREADPRIVATE(xtrain_fall,xtsnow_fall)
+#endif
 
 !clesphy0 param physiq
@@ -80 +86 @@
       REAL, ALLOCATABLE, SAVE :: prw_ancien(:), prlw_ancien(:), prsw_ancien(:)
 !$OMP THREADPRIVATE(prw_ancien, prlw_ancien, prsw_ancien)
+#ifdef ISO
+      REAL, ALLOCATABLE, SAVE :: xt_ancien(:,:,:),xtl_ancien(:,:,:),xts_ancien(:,:,:)
+!$OMP THREADPRIVATE(xt_ancien,xtl_ancien,xts_ancien)
+#endif
       REAL, ALLOCATABLE, SAVE :: u_ancien(:,:), v_ancien(:,:)
 !$OMP THREADPRIVATE(u_ancien, v_ancien)
@@ -221 +231 @@
       REAL,ALLOCATABLE,SAVE :: fqd(:,:)     
 !$OMP THREADPRIVATE(fqd)
+#ifdef ISO
+      REAL, ALLOCATABLE, SAVE :: fxtd(:,:,:)
+!$OMP THREADPRIVATE(fxtd)
+#endif
 !34EK
 ! -- Variables de controle de ALE et ALP
@@ -260 +274 @@
       REAL,ALLOCATABLE,SAVE :: wake_deltaq(:,:)
 !$OMP THREADPRIVATE(wake_deltaq)
+#ifdef ISO
+      REAL, ALLOCATABLE, SAVE :: wake_deltaxt(:,:,:)
+!$OMP THREADPRIVATE(wake_deltaxt)
+#endif
       REAL,ALLOCATABLE,SAVE :: wake_s(:)
 !$OMP THREADPRIVATE(wake_s)
@@ -397 +415 @@
 !$OMP THREADPRIVATE(snow_con)
 !
+#ifdef ISO
+      REAL,SAVE,ALLOCATABLE :: xtrain_con(:,:)
+!$OMP THREADPRIVATE(xtrain_con)
+      REAL,SAVE,ALLOCATABLE :: xtsnow_con(:,:)
+!$OMP THREADPRIVATE(xtsnow_con)
+#endif
       REAL,SAVE,ALLOCATABLE :: rlonPOS(:)
 !$OMP THREADPRIVATE(rlonPOS)
@@ -431 +455 @@
 !$OMP THREADPRIVATE(ratqs_inter)
 
+#ifdef ISO
+#ifdef ISOTRAC
+      INTEGER,SAVE,ALLOCATABLE :: bassin_map(:)
+!$OMP THREADPRIVATE(bassin_map)
+      INTEGER,SAVE,ALLOCATABLE :: boite_map(:,:)
+!$OMP THREADPRIVATE(boite_map)
+#endif   
+#endif
       REAL, ALLOCATABLE, SAVE:: du_gwd_rando(:, :), du_gwd_front(:, :)
       !$OMP THREADPRIVATE(du_gwd_rando, du_gwd_front)
@@ -466 +498 @@
 USE aero_mod
 USE infotrac_phy, ONLY : nbtr
+#ifdef ISO
+USE infotrac_phy, ONLY : ntraciso,niso
+#endif
 USE indice_sol_mod
 use config_ocean_skin_m, only: activate_ocean_skin
@@ -659 +694 @@
       ALLOCATE(cg_aero_lw_rrtm(klon,klev,2,nbands_lw_rrtm))
       ALLOCATE(ccm(klon,klev,nbands))
+
+#ifdef ISO
+      ALLOCATE(xtsol(niso,klon),fxtevap(ntraciso,klon,nbsrf))
+      ALLOCATE(fxtd(ntraciso,klon,klev))
+      ALLOCATE(wake_deltaxt(ntraciso,klon,klev))
+      ALLOCATE(xt_ancien(ntraciso,klon,klev))
+      ALLOCATE(xtl_ancien(ntraciso,klon,klev))
+      ALLOCATE(xts_ancien(ntraciso,klon,klev))
+      ALLOCATE(xtrain_fall(ntraciso,klon))
+      ALLOCATE(xtsnow_fall(ntraciso,klon))
+      ALLOCATE(xtrain_con(ntraciso,klon))
+      ALLOCATE(xtsnow_con(ntraciso,klon))
+#ifdef ISOTRAC
+      ALLOCATE(bassin_map(klon))
+      ALLOCATE(boite_map(klon,klev))  
+#endif      
+#endif
+
       ALLOCATE(ale_bl_trig(klon))
       ALLOCATE(ratqs_inter(klon,klev))
@@ -811 +864 @@
            delta_sst)
 
+#ifdef ISO    
+      DEALLOCATE(xtsol,fxtevap)  
+      DEALLOCATE(xt_ancien,xtl_ancien,xts_ancien, fxtd, wake_deltaxt)
+      DEALLOCATE(xtrain_fall, xtsnow_fall, xtrain_con, xtsnow_con)
+#ifdef ISOTRAC 
+      DEALLOCATE(bassin_map,boite_map) 
+#endif        
+#endif
       is_initialized=.FALSE.
       

LMDZ6/trunk/libf/phylmdiso/phys_state_var_mod.F90

@@ -100 +100 @@
       REAL, ALLOCATABLE, SAVE :: clwcon(:,:),rnebcon(:,:)
 !$OMP THREADPRIVATE(clwcon,rnebcon)
+      REAL, ALLOCATABLE, SAVE :: rneb_ancien(:,:)
+!$OMP THREADPRIVATE(rneb_ancien)
       REAL, ALLOCATABLE, SAVE :: qtc_cv(:,:),sigt_cv(:,:)
 !$OMP THREADPRIVATE(qtc_cv,sigt_cv)
@@ -549 +551 @@
 !!! Rom P <<<
       ALLOCATE(clwcon(klon,klev),rnebcon(klon,klev))
+      ALLOCATE(rneb_ancien(klon,klev))
       ALLOCATE(qtc_cv(klon,klev),sigt_cv(klon,klev))
       ALLOCATE(ratqs(klon,klev))
@@ -742 +745 @@
       DEALLOCATE(zthe, zpic, zval)
       DEALLOCATE(rugoro, t_ancien, q_ancien, clwcon, rnebcon)
-      DEALLOCATE(qs_ancien, ql_ancien)
+      DEALLOCATE(qs_ancien, ql_ancien, rneb_ancien)
       DEALLOCATE(prw_ancien, prlw_ancien, prsw_ancien)
       DEALLOCATE(qtc_cv,sigt_cv)