Changeset 1236 for trunk/LMDZ.MARS/libf/phymars/vdif_cd.F

Timestamp:

May 5, 2014, 11:38:51 AM (11 years ago)

Author:

aslmd

Message:

MESOSCALE. A necessary complement commit to r1234 where a upgraded interface making use of modules was proposed. Completed the new formulation for module_lmd_driver for newphys with improved interface with both ini/bdy conditions and physical parameterizations. Changed the Registry accordingly. Finished changes about I/O with the LMD physics (see LMDZ.MARS/README). Made all those changes compatible for old interface, and LES runs (checked with test cases), as well as old input files. Changed makemeso to account for full flexibility on changin nx ny ntracers nproc with newphys. Cleaned the now obsolete bits of code used in LMD physics shared with the GCM. ----- Everything is now ready to properly code both restart runs and nesting for mesoscale runs with new physics.

File:

• trunk/LMDZ.MARS/libf/phymars/vdif_cd.F (modified) (3 diffs)

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

@@ -1 +1 @@
       SUBROUTINE vdif_cd(ngrid,nlay,pz0,
-     &           pg,pz,pu,pv,wstar,pts,ph,pcdv,pcdh
-#ifdef MESOSCALE
-     &                ,flag_LES
-#endif
-     &                  )
+     &           pg,pz,pu,pv,wstar,pts,ph,pcdv,pcdh)
       USE comcstfi_h
+      use turb_mod, only: turb_resolved
       IMPLICIT NONE
 c=======================================================================
@@ -52 +49 @@
       REAL, INTENT(IN) :: wstar(ngrid)
       REAL, INTENT(OUT) :: pcdv(ngrid),pcdh(ngrid) ! momentum and heat drag coefficient
-
-#ifdef MESOSCALE
-      LOGICAL, INTENT(IN) :: flag_LES     !! pour LES avec isfflx!=0
-#endif
 
 c   Local:
@@ -160 +153 @@
           zu2(ig)=pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1) 
      &     + (log(1.+0.7*wstar(ig) + 2.3*wstar(ig)**2))**2 
-#ifdef MESOSCALE
-          if(flag_LES) then
+          if(turb_resolved) then
              zu2(ig)=MAX(zu2(ig),1.)
           endif
-#endif
 !       zu2(ig)=pu(ig,1)*pu(ig,1) + pv(ig,1)*pv(ig,1) + (0.5*wstar(ig))**2