Changeset 3244 for trunk

Timestamp:

Feb 29, 2024, 2:21:55 PM (9 months ago)

Author:

afalco

Message:

Pluto PCM:
Give priority to vdifc from pluto.old & fixed it.
AF

File:

• trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90 (modified) (3 diffs)

trunk/LMDZ.PLUTO/libf/phypluto/physiq_mod.F90

@@ -16 +16 @@
       use write_field_phy, only: Writefield_phy
 !!
-      use ieee_arithmetic
       use ioipsl_getin_p_mod, only: getin_p
       use radinc_h, only : L_NSPECTI,L_NSPECTV,naerkind, corrkdir, banddir
@@ -1043 +1042 @@
          zflubid(1:ngrid)=fluxrad(1:ngrid)+fluxgrd(1:ngrid)
 
-         ! JL12 the following if test is temporarily there to allow us to compare the old vdifc with turbdiff.
-         if (UseTurbDiff) then
-
-            call turbdiff(ngrid,nlayer,nq,                  &
-                          ptimestep,capcal,                      &
-                          pplay,pplev,zzlay,zzlev,z0,            &
-                          pu,pv,pt,zpopsk,pq,tsurf,emis,qsurf,   &
-                          pdt,pdq,zflubid,                       &
-                          zdudif,zdvdif,zdtdif,zdtsdif,          &
-                          sensibFlux,q2,zdqdif,zdqevap,zdqsdif,  &
-                          taux,tauy)
-
-         else  if (UseVdifcPlutold) then
+         if (UseVdifcPlutold) then
             zflubid(1:ngrid)=fluxrad(1:ngrid)+fluxgrd(1:ngrid)
+            zdum1(:,:) = 0
+            zdum2(:,:) = 0
+            zdh(:,:)=pdt(:,:)/zpopsk(:,:)
 
             ! Calling vdif (Martian version WITH N2 condensation)
@@ -1096 +1086 @@
             !------------------------------------------------------------------
 
-         else ! if (UseVdifcPlutold)
+         ! JL12 the following if test is temporarily there to allow us to compare the old vdifc with turbdiff.
+         else if (UseTurbDiff) then
+
+            call turbdiff(ngrid,nlayer,nq,                  &
+                          ptimestep,capcal,                      &
+                          pplay,pplev,zzlay,zzlev,z0,            &
+                          pu,pv,pt,zpopsk,pq,tsurf,emis,qsurf,   &
+                          pdt,pdq,zflubid,                       &
+                          zdudif,zdvdif,zdtdif,zdtsdif,          &
+                          sensibFlux,q2,zdqdif,zdqevap,zdqsdif,  &
+                          taux,tauy)
+
+         else ! if (UseVdifcPlutold) .and. (UseTurbDiff)
 
             zdh(1:ngrid,1:nlayer)=pdt(1:ngrid,1:nlayer)/zpopsk(1:ngrid,1:nlayer)