Changeset 2865 for trunk/LMDZ.GENERIC

Timestamp:

Jan 16, 2023, 4:47:05 PM (2 years ago)

Author:

jleconte

Message:

Changes to comm_wrf to have new output variables

Location:

trunk/LMDZ.GENERIC/libf/phystd

Files:

• comm_wrf.F90 (modified) (6 diffs)
• physiq_mod.F90 (modified) (2 diffs)

trunk/LMDZ.GENERIC/libf/phystd/comm_wrf.F90

@@ -20 +20 @@
   REAL,SAVE,ALLOCATABLE :: comm_CLOUDFRAC(:,:)
   REAL,SAVE,ALLOCATABLE :: comm_TOTCLOUDFRAC(:)
-  REAL,SAVE,ALLOCATABLE :: comm_RAIN(:,:)
-  REAL,SAVE,ALLOCATABLE :: comm_SNOW(:,:)
+  REAL,SAVE,ALLOCATABLE :: comm_RH(:,:)
+  REAL,SAVE,ALLOCATABLE :: comm_DQICE(:,:)
+  REAL,SAVE,ALLOCATABLE :: comm_DQVAP(:,:)
   REAL,SAVE,ALLOCATABLE :: comm_ALBEQ(:) 
   REAL,SAVE,ALLOCATABLE :: comm_FLUXTOP_DN(:)
@@ -29 +30 @@
   REAL,SAVE,ALLOCATABLE :: comm_FLUXSURF_LW(:)
   REAL,SAVE,ALLOCATABLE :: comm_FLXGRD(:)
-  REAL,SAVE,ALLOCATABLE :: comm_LSCEZ(:,:)
+  REAL,SAVE,ALLOCATABLE :: comm_DTRAIN(:,:)
+  REAL,SAVE,ALLOCATABLE :: comm_DTLSC(:,:)
   REAL,SAVE,ALLOCATABLE :: comm_H2OICE_REFF(:,:)
   REAL,SAVE,ALLOCATABLE :: comm_LATENT_HF(:)
@@ -56 +58 @@
   allocate(comm_CLOUDFRAC(ngrid,nlayer))
   allocate(comm_TOTCLOUDFRAC(ngrid))
-  allocate(comm_RAIN(ngrid,nlayer))
-  allocate(comm_SNOW(ngrid,nlayer))
+  allocate(comm_RH(ngrid,nlayer))
+  allocate(comm_DQICE(ngrid,nlayer))
+  allocate(comm_DQVAP(ngrid,nlayer))
   allocate(comm_ALBEQ(ngrid))
   allocate(comm_FLUXTOP_DN(ngrid))
@@ -65 +68 @@
   allocate(comm_FLUXSURF_LW(ngrid))
   allocate(comm_FLXGRD(ngrid))
-  allocate(comm_LSCEZ(ngrid,nlayer))
+  allocate(comm_DTRAIN(ngrid,nlayer))
+  allocate(comm_DTLSC(ngrid,nlayer))
   allocate(comm_H2OICE_REFF(ngrid,nlayer))
   allocate(comm_LATENT_HF(ngrid))
@@ -90 +94 @@
   deallocate(comm_CLOUDFRAC)
   deallocate(comm_TOTCLOUDFRAC)
-  deallocate(comm_RAIN)
-  deallocate(comm_SNOW)
+  deallocate(comm_RH)
+  deallocate(comm_DQICE)
+  deallocate(comm_DQVAP)
   deallocate(comm_ALBEQ)
   deallocate(comm_FLUXTOP_DN)
@@ -99 +104 @@
   deallocate(comm_FLUXSURF_LW)
   deallocate(comm_FLXGRD)
-  deallocate(comm_LSCEZ)
+  deallocate(comm_DTRAIN)
+  deallocate(comm_DTLSC)
   deallocate(comm_H2OICE_REFF)
   deallocate(comm_LATENT_HF)

trunk/LMDZ.GENERIC/libf/phystd/physiq_mod.F90

@@ -78 +78 @@
       use mod_phys_lmdz_omp_data, ONLY: is_omp_master
 #else
-      use comm_wrf, only : comm_HR_SW, comm_HR_LW, &
-                           comm_CLOUDFRAC,comm_TOTCLOUDFRAC,&
-                           comm_SURFRAIN,comm_REEVAP,comm_HR_DYN,&
-                           comm_RAIN,comm_SNOW,comm_ALBEQ,&
-                           comm_FLUXTOP_DN,comm_FLUXABS_SW,&
-                           comm_FLUXTOP_LW,comm_FLUXSURF_SW,&
-                           comm_FLUXSURF_LW,comm_FLXGRD,&
-                           comm_LSCEZ,comm_H2OICE_REFF
+      use comm_wrf, only : comm_HR_SW, comm_HR_LW,  &
+         comm_CLOUDFRAC,comm_TOTCLOUDFRAC, comm_RH, &
+         comm_SURFRAIN,comm_REEVAP,comm_HR_DYN,     &
+         comm_DQICE,comm_DQVAP,comm_ALBEQ,   &
+         comm_FLUXTOP_DN,comm_FLUXABS_SW,           &
+         comm_FLUXTOP_LW,comm_FLUXSURF_SW,          &
+         comm_FLUXSURF_LW,comm_FLXGRD,              &
+         comm_DTRAIN,comm_DTLSC,comm_H2OICE_REFF
 #endif
 
@@ -2572 +2572 @@
 
 #else
-      comm_HR_SW(1:ngrid,1:nlayer) = zdtsw(1:ngrid,1:nlayer)
-      comm_HR_LW(1:ngrid,1:nlayer) = zdtlw(1:ngrid,1:nlayer)
-      if ((tracer).and.(water)) then
-        comm_CLOUDFRAC(1:ngrid,1:nlayer)=cloudfrac(1:ngrid,1:nlayer)
-        comm_TOTCLOUDFRAC(1:ngrid)=totcloudfrac(1:ngrid)
-        comm_RAIN(1:ngrid,1:nlayer)=zdqrain(1:ngrid,1:nlayer,igcm_h2o_vap)
-        comm_SURFRAIN(1:ngrid)=zdqsrain(1:ngrid)
-        comm_SNOW(1:ngrid,1:nlayer)=zdqrain(1:ngrid,1:nlayer,igcm_h2o_ice)
-        comm_ALBEQ(1:ngrid)=albedo_equivalent(1:ngrid)
-        comm_H2OICE_REFF(1:ngrid,1:nlayer)=reffrad(1:ngrid,1:nlayer,iaero_h2o)
-        comm_REEVAP(1:ngrid)=reevap_precip(1:ngrid)
-      endif
-      comm_FLUXTOP_DN(1:ngrid)=fluxtop_dn(1:ngrid)
-      comm_FLUXABS_SW(1:ngrid)=fluxabs_sw(1:ngrid)
-      comm_FLUXTOP_LW(1:ngrid)=fluxtop_lw(1:ngrid)
-      comm_FLUXSURF_SW(1:ngrid)=fluxsurf_sw(1:ngrid)
-      comm_FLUXSURF_LW(1:ngrid)=fluxsurf_lw(1:ngrid)
-      comm_FLXGRD(1:ngrid)=fluxgrd(1:ngrid)
-      comm_LSCEZ(1:ngrid,1:nlayer)=lscaledEz(1:ngrid,1:nlayer)
-      sensibFlux(1:ngrid) = zflubid(1:ngrid) - capcal(1:ngrid)*zdtsdif(1:ngrid) !!! ????
+   comm_HR_SW(1:ngrid,1:nlayer) = zdtsw(1:ngrid,1:nlayer)
+   comm_HR_LW(1:ngrid,1:nlayer) = zdtlw(1:ngrid,1:nlayer)
+   if ((tracer).and.(water)) then
+     comm_CLOUDFRAC(1:ngrid,1:nlayer)=cloudfrac(1:ngrid,1:nlayer)
+     comm_TOTCLOUDFRAC(1:ngrid)=totcloudfrac(1:ngrid)
+     comm_SURFRAIN(1:ngrid)=zdqsrain(1:ngrid)
+     comm_DQVAP(1:ngrid,1:nlayer)=pdq(1:ngrid,1:nlayer,igcm_h2o_vap)
+     comm_ALBEQ(1:ngrid)=albedo_equivalent(1:ngrid)
+     comm_H2OICE_REFF(1:ngrid,1:nlayer)=reffrad(1:ngrid,1:nlayer,iaero_h2o)
+     comm_REEVAP(1:ngrid)=reevap_precip(1:ngrid)
+     comm_DTRAIN(1:ngrid,1:nlayer)=zdtrain(1:ngrid,1:nlayer)
+     comm_DTLSC(1:ngrid,1:nlayer)=dtlscale(1:ngrid,1:nlayer)
+     comm_RH(1:ngrid,1:nlayer)=RH(1:ngrid,1:nlayer)
+   endif
+   !comm_DQICE(1:ngrid,1:nlayer)=zdqdyn(1:ngrid,1:nlayer)
+   comm_FLUXTOP_DN(1:ngrid)=fluxtop_dn(1:ngrid)
+   comm_FLUXABS_SW(1:ngrid)=fluxabs_sw(1:ngrid)
+   comm_FLUXTOP_LW(1:ngrid)=fluxtop_lw(1:ngrid)
+   comm_FLUXSURF_SW(1:ngrid)=fluxsurf_sw(1:ngrid)
+   comm_FLUXSURF_LW(1:ngrid)=fluxsurf_lw(1:ngrid)
+   comm_FLXGRD(1:ngrid)=fluxgrd(1:ngrid)
+   sensibFlux(1:ngrid) = zflubid(1:ngrid) - capcal(1:ngrid)*zdtsdif(1:ngrid) !!! ????
+   comm_HR_DYN(1:ngrid,1:nlayer) = zdtdyn(1:ngrid,1:nlayer)
 
       if (turb_resolved) then