Changeset 790 for trunk

Timestamp:

Sep 20, 2012, 5:50:17 PM (12 years ago)

Author:

acolaitis

Message:

MESOSCALE. Fixed lifting for LES runs (put lifting after newsedim otherwise lifting is stupidly counteracted). Transferred LES def files to SIMU DEF. Added def files for high resolution monster LES. Fixed a small bug in makemeso for debug.

Location:

trunk

Files:

• LMDZ.MARS/libf/phymars/meso_inc/meso_inc_les.F (modified) (1 diff)
• LMDZ.MARS/libf/phymars/meso_inc/meso_inc_lift_les.F (added)
• LMDZ.MARS/libf/phymars/physiq.F (modified) (4 diffs)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/REF_ARTICLE_LES_QJ (moved) (moved from trunk/MESOSCALE/LMD_MM_MARS/SRC/LES/modif_mars/DEF)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/callphys.def (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/input_coord (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/input_more (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/input_sounding (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/input_therm (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/namelist.input (added)
• MESOSCALE/LMD_MM_MARS/SIMU/DEF/highresLES/run.def (added)
• MESOSCALE/LMD_MM_MARS/makemeso (modified) (4 diffs)

trunk/LMDZ.MARS/libf/phymars/meso_inc/meso_inc_les.F

@@ -55 +55 @@
             zdudif(ig,l) = 0.
             zdhdif(ig,l) = 0.
-            DO iq=1, nq
-              zdqdif(ig,l,iq) = 0.
-              zdqsdif(ig,iq) = 0. !! sortir de la boucle
-            ENDDO 
           ENDDO
          ENDDO
+         IF (lifting .and. doubleq) THEN 
+         !! lifted dust is injected in the first layer. 
+         !! Sedimentation must be called after turbulent mixing, i.e. on next step, after WRF. 
+         !! => lifted dust is not incremented before the sedimentation step.
+            zdqdif(:,1,:)=0.
+            zdqdif(:,1,igcm_dust_number)=-zdqsdif(:,igcm_dust_number)
+            zdqdif(:,1,igcm_dust_mass)=-zdqsdif(:,igcm_dust_mass)
+            zdqdif(:,2:nlayermx,:)=0.
+            DO iq=1, nq
+              IF ((iq .ne. igcm_dust_mass)
+     &        .and. (iq .ne. igcm_dust_number)) THEN
+                zdqsdif(:,iq)=0.
+              ENDIF
+            ENDDO
+         ELSE
+            DO ig=1,ngrid
+             DO l=1,nlayer
+              DO iq=1, nq
+                zdqdif(ig,l,iq) = 0.
+                zdqsdif(ig,iq) = 0. !! sortir de la boucle
+              ENDDO 
+             ENDDO
+            ENDDO
+         ENDIF
       ENDIF
 !!! LES LES        

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

@@ -363 +363 @@
       REAL L_mo(ngridmx),vhf(ngridmx),vvv(ngridmx)
       REAL zu2(ngridmx),sensibFlux(ngridmx)
+
 c=======================================================================
 
@@ -823 +824 @@
           ENDDO
 
-         if (tracer) then 
+         if (tracer) then
+#ifdef MESOSCALE
+         IF (.not.flag_LES) THEN
+#endif 
            DO iq=1, nq
             DO l=1,nlayer
@@ -836 +840 @@
               ENDDO
            ENDDO
+#ifdef MESOSCALE
+         ENDIF
+#endif 
          end if ! of if (tracer)
 
@@ -1128 +1135 @@
            ENDDO
          END IF   ! of IF (sedimentation)
-         
+        
+c Add lifted dust to tendancies after sedimentation in the LES
+#ifdef MESOSCALE
+#include "meso_inc/meso_inc_lift_les.F"
+#endif
+
 c
 c   7c. Chemical species

trunk/MESOSCALE/LMD_MM_MARS/makemeso

@@ -383 +383 @@
                              then
                              echo 'DEBUG DEBUG DEBUG DEBUG'
-                             sed s+"#-g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
+                             sed s+"# -g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
                              mv -f yeah configure.wrf
                        fi
@@ -431 +431 @@
                              then
                              echo 'DEBUG DEBUG DEBUG DEBUG'
-                             sed s+"#-g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
+                             sed s+"# -g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
                              mv -f yeah configure.wrf
                        fi
@@ -446 +446 @@
                              then
                              echo 'DEBUG DEBUG DEBUG DEBUG'
-                             sed s+"#-g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
+                             sed s+"# -g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
                              mv -f yeah configure.wrf
                        fi
@@ -553 +553 @@
   then
     echo 'DEBUG DEBUG DEBUG DEBUG'
-    sed s+"#-g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
-    #sed s+"#-g"+"-g -Ktrap=fp -Mbounds"+g configure.wrf > yeah 
-    #sed s+"#-g"+"-g"+g configure.wrf > yeah
+    sed s+"# -g"+" -g -no-ftz -traceback -ftrapuv -fp-stack-check -check"+g configure.wrf > yeah
+    #sed s+"# -g"+"-g -Ktrap=fp -Mbounds"+g configure.wrf > yeah 
+    #sed s+"# -g"+"-g"+g configure.wrf > yeah
     mv -f yeah configure.wrf
   fi