Changeset 1239 for trunk/LMDZ.MARS/libf/phymars

Timestamp:

May 9, 2014, 11:00:47 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS. added a keyword in callphys.def named yamada4 to activate or not the latest version of SGS mixing; previously it was done through calltherm keyword which could be misleading.

Location:

trunk/LMDZ.MARS/libf/phymars

Files:

• callkeys.h (modified) (2 diffs)
• conf_phys.F (modified) (1 diff)
• vdifc.F (modified) (1 diff)

trunk/LMDZ.MARS/libf/phymars/callkeys.h

@@ -13 +13 @@
      &   ,lifting,freedust,callddevil,scavenging,sedimentation          &
      &   ,activice,water,tifeedback,microphys,caps,photochem,calltherm  &
-     &   ,callrichsl,callslope,tituscap
+     &   ,callrichsl,callslope,tituscap,yamada4
      
       COMMON/callkeys_i/iradia,iaervar,iddist,ilwd,ilwb,ilwn,ncouche    &
@@ -26 +26 @@
      &   ,callnirco2,callnlte,callthermos,callconduct,                  &
      &    calleuv,callmolvis,callmoldiff,thermochem,thermoswater        &
-     &   ,calltherm,callrichsl,callslope,tituscap
+     &   ,calltherm,callrichsl,callslope,tituscap,yamada4
 
 

trunk/LMDZ.MARS/libf/phymars/conf_phys.F

@@ -223 +223 @@
          call getin("calladj",calladj)
          write(*,*) " calladj = ",calladj
-         
-         if (calltherm .and. (.not. calladj)) then
-          print*,'Convadj has to be activated when using thermals'
-          stop
-         endif
-
+
+         if (calltherm .and. calladj) then
+          print*,'!!! PLEASE NOTE !!!'
+          print*,'convective adjustment is on'
+          print*,'but since thermal plume model is on'
+          print*,'convadj is only activated above the PBL'
+         endif
+        
+         write(*,*) "used latest version of yamada scheme?"
+         yamada4=.true. ! default value
+         call getin("yamada4",yamada4)
+         write(*,*) " yamada4 = ",yamada4
+
+         if (calltherm .and. .not.yamada4) then
+          print*,'!!!! WARNING WARNING WARNING !!!!'
+          print*,'if calltherm=T we strongly advise that '
+          print*,'you set the flag yamada4 to T '
+          print*,'!!!! WARNING WARNING WARNING !!!!'
+         endif
+ 
          write(*,*) "call Richardson-based surface layer ?"
          callrichsl=.false. ! default value

trunk/LMDZ.MARS/libf/phymars/vdifc.F

@@ -373 +373 @@
 c    ** schema de diffusion turbulente dans la couche limite
 c       ---------------------------------------------------- 
-       IF (.not. calltherm) THEN
+       IF (.not. yamada4) THEN
 
        CALL vdif_kc(ngrid,nlay,nq,ptimestep,g,pzlev,pzlay