Changeset 1236 for trunk/LMDZ.MARS/libf/phymars/vdifc.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/vdifc.F (modified) (7 diffs)

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

@@ -6 +6 @@
      $                pdudif,pdvdif,pdhdif,pdtsrf,pq2,
      $                pdqdif,pdqsdif,wstar,zcdv_true,zcdh_true,
-     $                hfmax,sensibFlux
-#ifdef MESOSCALE
-     &                ,flag_LES
-#endif
-     &                )
+     $                hfmax,sensibFlux)
+
       use tracer_mod, only: noms, igcm_dust_mass, igcm_dust_number,
      &                      igcm_dust_submicron, igcm_h2o_vap,
@@ -16 +13 @@
       use surfdat_h, only: watercaptag, frost_albedo_threshold, dryness
       USE comcstfi_h
+      use turb_mod, only: turb_resolved
       IMPLICIT NONE
 
@@ -156 +154 @@
       REAL,INTENT(OUT) :: sensibFlux(ngrid)
 
-#ifdef MESOSCALE
-      LOGICAL flag_LES     !! pour LES avec isfflx!=0
-#endif
 c    ** un petit test de coherence
 c       --------------------------
@@ -330 +325 @@
 
       CALL vdif_cd(ngrid,nlay,pz0,g,pzlay,pu,pv,wstar,ptsrf,ph
-     &             ,zcdv_true,zcdh_true
-#ifdef MESOSCALE
-     &                ,flag_LES
-#endif
-     &           )
+     &             ,zcdv_true,zcdh_true)
 
         zu2(:)=pu(:,1)*pu(:,1)+pv(:,1)*pv(:,1)
@@ -554 +545 @@
 
       llnt(:)=1
-#ifdef MESOSCALE
-      IF (.not.flag_LES) THEN
-#endif
+      IF (.not.turb_resolved) THEN
       IF (callcond) THEN
        DO ig=1,ngrid
@@ -570 +559 @@
       ENDIF
 
-#ifdef MESOSCALE
       ENDIF
-#endif
 
       DO ig=1,ngrid
@@ -717 +704 @@
              end do
            else
+#endif
             call dustlift(ngrid,nlay,nq,rho,zcdh_true,zcdh,co2ice,
      &                    pdqsdif)
+#ifndef MESOSCALE
            endif !doubleq.AND.submicron
-#else
-            call dustlift(ngrid,nlay,nq,rho,zcdh_true,zcdh,co2ice,
-     &                    pdqsdif)
 #endif
         else