Changeset 1240 for trunk

Timestamp:

May 9, 2014, 11:09:49 AM (11 years ago)

Author:

aslmd

Message:

LMDZ.MARS made a mistake in previous commit. corrected.

Location:

trunk/LMDZ.MARS

Files:

• README (modified) (1 diff)
• libf/phymars/callkeys.h (modified) (2 diffs)
• libf/phymars/conf_phys.F (modified) (1 diff)
• libf/phymars/vdifc.F (modified) (1 diff)

trunk/LMDZ.MARS/README

@@ -2081 +2081 @@
 
 == 09/05/2014 == AS
-- Added a flag yamada4 in callphys.def to activate or not the latest version
+- Added a flag callyamada4 in callphys.def to activate or not the latest version
 for subgrid-scale mixing. It is T by default.
 - Warnings in conf_phys modified accordingly.

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

@@ -13 +13 @@
      &   ,lifting,freedust,callddevil,scavenging,sedimentation          &
      &   ,activice,water,tifeedback,microphys,caps,photochem,calltherm  &
-     &   ,callrichsl,callslope,tituscap,yamada4
+     &   ,callrichsl,callslope,tituscap,callyamada4
      
       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,yamada4
+     &   ,calltherm,callrichsl,callslope,tituscap,callyamada4
 
 

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

@@ -232 +232 @@
         
          write(*,*) "used latest version of yamada scheme?"
-         yamada4=.true. ! default value
-         call getin("yamada4",yamada4)
-         write(*,*) " yamada4 = ",yamada4
-
-         if (calltherm .and. .not.yamada4) then
+         callyamada4=.true. ! default value
+         call getin("callyamada4",callyamada4)
+         write(*,*) " callyamada4 = ",callyamada4
+
+         if (calltherm .and. .not.callyamada4) then
           print*,'!!!! WARNING WARNING WARNING !!!!'
           print*,'if calltherm=T we strongly advise that '
-          print*,'you set the flag yamada4 to T '
+          print*,'you set the flag callyamada4 to T '
           print*,'!!!! WARNING WARNING WARNING !!!!'
          endif

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

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