Changeset 86 for trunk/mesoscale

Timestamp:

Mar 3, 2011, 12:38:49 PM (14 years ago)

Author:

aslmd

Message:

*
mars + LMD_MM_MARS * Precompilation flag MESOSCALE for better transparency

* in shared phymars between GCM and mesoscale model

*

M 85 mars/libf/phymars/meso_physiq.F
M 85 mars/libf/phymars/meso_inifis.F
Added a pre-compilation flag MESOSCALE so that the LMDZ.MARS GCM
will compile without stating errors because of mesoscale routines.

M 85 mars/libf/phymars/newcondens.F
M 85 mars/libf/phymars/testphys1d.F
M 85 mars/libf/phymars/dustlift.F
D 85 mars/libf/phymars/meso_testphys1d.F
D 85 mars/libf/phymars/meso_dustlift.F
D 85 mars/libf/phymars/meso_newcondens.F
Now, this MESOSCALE precompilation flag can be used to lower
the number of meso_* routines when adaptations for mesoscale
applications are not very extended.
--> Three meso_* routines were deleted and changes are
now impacted under the MESOSCALE flag in the original GCM routines
--> Completely transparent for GCM compilation since it is devoid
of the -DMESOSCALE option
--> Very good for syncing because changes in dustlift, newcondens
will be directly available in the mesoscale model

M 84 mesoscale/LMD_MM_MARS/makemeso
Changed meso_testphys1d in testphys1d

M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_pgf
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpifort
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_ifort
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpi
Added the option -DMESOSCALE in these scripts

*
LMD_MM_MARS * Various minor changes related to water cycle and plotting routines

* Also included the GW test case

*

A 0 mesoscale/LMDZ.MARS.new/myGCM/DEFS_JB/callphys.def.orig
M 84 mesoscale/NOTES.txt
D 84 mesoscale/LMD_MM_MARS/SRC/ARWpost/idl
M 84 mesoscale/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM
M 84 mesoscale/LMD_MM_MARS/SIMU/gnome_launch.meso
M 85 mesoscale/PLOT/MINIMAL/map_latlon.pro
D 85 mesoscale/PLOT/SPEC/LES/getget.pro
M 85 mesoscale/PLOT/SPEC/MAP/map_uvt.pro
A + - mesoscale/PLOT/SPEC/getget.pro
A 0 mesoscale/PLOT/RESERVE/obsolete
A 0 mesoscale/TESTS/TESTGW.tar.gz
M 84 000-USERS

Location:

trunk/mesoscale

Files:

• LMDZ.MARS.new/myGCM/DEFS_JB/callphys.def.orig (added)
• LMD_MM_MARS/SIMU/gnome_launch.meso (modified) (1 diff)
• LMD_MM_MARS/SRC/ARWpost/idl (deleted)
• LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM (modified) (1 diff)
• LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95 (modified) (2 diffs)
• LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_ifort (modified) (2 diffs)
• LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpi (modified) (2 diffs)
• LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpifort (modified) (2 diffs)
• LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_pgf (modified) (2 diffs)
• LMD_MM_MARS/makemeso (modified) (2 diffs)
• NOTES.txt (modified) (1 diff)
• PLOT/MINIMAL/map_latlon.pro (modified) (1 diff)
• PLOT/RESERVE/obsolete (added)
• PLOT/RESERVE/obsolete/movie.idl (added)
• PLOT/RESERVE/obsolete/out_diagfi.pro (added)
• PLOT/RESERVE/obsolete/out_diagfi_new.pro (added)
• PLOT/RESERVE/obsolete/out_wrf.pro (added)
• PLOT/RESERVE/obsolete/plot.def (added)
• PLOT/RESERVE/obsolete/read_dat.pro (added)
• PLOT/RESERVE/obsolete/report.idl (added)
• PLOT/RESERVE/obsolete/see.idl (added)
• PLOT/RESERVE/obsolete/trace.idl (added)
• PLOT/RESERVE/obsolete/trace.idl_old (added)
• PLOT/RESERVE/obsolete/user.idl_old (added)
• PLOT/SPEC/MAP/map_uvt.pro (modified) (3 diffs)
• PLOT/SPEC/getget.pro (moved) (moved from trunk/mesoscale/PLOT/SPEC/LES/getget.pro)
• TESTS/TESTGW.tar.gz (added)

trunk/mesoscale/LMD_MM_MARS/SIMU/gnome_launch.meso ¶

@@ -13 +13 @@
 ## @ class =CP
 # @ environment=tmpdir=$(job_name).$(jobid).results
+# @ notification = never
 # @ queue
 grep "^# @" $0

trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM ¶

@@ -101 +101 @@
 state  real  HR_NIR    ikj  misc  1  -  rd   "HR_NIR"    "HEATING RATE nirco2"             "K/s"     #SAVEMARS3 zdtnirco2
 state  real  HR_NLTE   ikj  misc  1  -  rd   "HR_NLTE"   "HEATING RATE nlte"               "K/s"     #SAVEMARS3 zdtnlte
-state  real  ALBBARE   ij   misc  1  -  rhd  "ALBBARE"   "SOIL ALBEDO"                     ""        #SAVEMARS2 albedodat
+state  real  ALBBARE   ij   misc  1  -  rd   "ALBBARE"   "SOIL ALBEDO"                     ""        #SAVEMARS2 albedodat
 state  real  VMR_ICE   ikj  misc  1  -  rhd  "VMR_ICE"   "VOL. MIXING RATIO ICE"           "ppm"     #SAVEMARS3 vmr
+state  real  TAU_ICE   ij   misc  1  -  rhd  "TAU_ICE"   "CLOUD OD at 825 cm-1 TES"        ""        #SAVEMARS2 tauTES
 ####
 ####

trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95 ¶

@@ -181 +181 @@
 # Ehouarn 'g95' compiler
 # Aymeric : added option for NETCDF libraries
-   set optim90=" -O2 -fno-second-underscore -fstatic -fzero -Wall "
-   set optimtru90=" -O2 -fno-second-underscore -fstatic -fzero -Wall "
+   set optim90=" -DMESOSCALE -O2 -fno-second-underscore -fstatic -fzero -Wall "
+   set optimtru90=" -DMESOSCALE -O2 -fno-second-underscore -fstatic -fzero -Wall "
 #   set opt_link=" -Mfree -L/usr/local/pgi/linux86/lib -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Wl,-Bstatic "
 # Ehouarn: there is no /usr/local/pgi/linux86/lib, but it doesn't matter
@@ -378 +378 @@
 #           set optim90="-mcmodel=medium"
 #         Aymeric : thought I'd complete the g95 debugging 
-          set optim="$optim"" -g -fbounds-check "
-          set optim90="$optim90"" -g -fbounds-check "
-          set optimtru90="$optimtru90"" -g -fbounds-check "
+          set optim="$optim"" -g -fbounds-check -DMESOSCALE "
+          set optim90="$optim90"" -g -fbounds-check -DMESOSCALE "
+          set optimtru90="$optimtru90"" -g -fbounds-check -DMESOSCALE "
         else 
            echo "pas d option debug predefinie pour cette machine"

trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_ifort ¶

@@ -181 +181 @@
 # Ehouarn 'ifort' compiler
    #NB: on gnome -O3 ==> NaNs ...
-   set optim=" -O2 -ip -mkl=sequential -align common "
-   set optim90=" -O2 -ip -mkl=sequential -align common "
-   set optimtru90=" -O2 -ip -mkl=sequential -align common "
+   set optim=" -DMESOSCALE -O2 -ip -mkl=sequential -align common "
+   set optim90=" -DMESOSCALE -O2 -ip -mkl=sequential -align common "
+   set optimtru90=" -DMESOSCALE -O2 -ip -mkl=sequential -align common "
 #   set opt_link=" -Mfree -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Bstatic "
    set mod_loc_dir=$LIBOGCM
@@ -374 +374 @@
         else if $LINUX then
            ## for ifort
-             set optim=" -g -no-ftz -traceback -ftrapuv -fp-stack-check "
-             set optim90=" -g -no-ftz -traceback -ftrapuv -fp-stack-check "
-             set optimtru90=" -g -no-ftz -traceback -ftrapuv -fp-stack-check "
+             set optim=" -DMESOSCALE -g -no-ftz -traceback -ftrapuv -fp-stack-check "
+             set optim90=" -DMESOSCALE -g -no-ftz -traceback -ftrapuv -fp-stack-check "
+             set optimtru90=" -DMESOSCALE -g -no-ftz -traceback -ftrapuv -fp-stack-check "
         else 
            echo "pas d option debug predefinie pour cette machine"

trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpi ¶

@@ -189 +189 @@
 ##-Ktrap=fp
 #   set optim90=" -fast -I. -Mlarge_arrays -mcmodel=medium" 
-   set optim=" -O2 -I. -Munroll -Mcache_align" #-C #-fpic" #-Mlarge_arrays -mcmodel=medium
-   set optim90=" -O2 -I. -Munroll -Mcache_align" #-C #-fpic" #-Mlarge_arrays -mcmodel=medium
+   set optim=" -DMESOSCALE -O2 -I. -Munroll -Mcache_align" #-C #-fpic" #-Mlarge_arrays -mcmodel=medium
+   set optim90=" -DMESOSCALE -O2 -I. -Munroll -Mcache_align" #-C #-fpic" #-Mlarge_arrays -mcmodel=medium
 ## Aymeric: added handling of large arrays and large memory
 ## Aymeric: get rid of -Mfree for mpi
 #   set optimtru90=" -fast -c -Mlarge_arrays -mcmodel=medium" 
-  set optimtru90=" -O2 -I. -Munroll -Mcache_align" #-C #-fpic" #-Mlarge_arrays -mcmodel=medium
+  set optimtru90=" -DMESOSCALE -O2 -I. -Munroll -Mcache_align" #-C #-fpic" #-Mlarge_arrays -mcmodel=medium
 #   set opt_link=" -Mfree -L/usr/local/pgi/linux86/lib -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Wl,-Bstatic "
 # Ehouarn: there is no /usr/local/pgi/linux86/lib, but it doesn't matter
@@ -388 +388 @@
            set optim90="$optim90"" -G1 "
         else if $LINUX then
-           set optim90="-g -Mbounds "
+           set optim90="-DMESOSCALE -g -Mbounds "
         else 
            echo "pas d option debug predefinie pour cette machine"

trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_mpifort ¶

@@ -181 +181 @@
 # Ehouarn 'ifort' compiler
    #NB: on gnome -O3 ==> NaNs ...
-   set optim=" -O2 -ip -mkl=sequential -align common "
-   set optim90=" -O2 -ip -mkl=sequential -align common "
-   set optimtru90=" -O2 -ip -mkl=sequential -align common "
+   set optim=" -DMESOSCALE -O2 -ip -mkl=sequential -align common "
+   set optim90=" -DMESOSCALE -O2 -ip -mkl=sequential -align common "
+   set optimtru90=" -DMESOSCALE -O2 -ip -mkl=sequential -align common "
 #   set opt_link=" -Mfree -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Bstatic "
    set mod_loc_dir=$LIBOGCM
@@ -374 +374 @@
         else if $LINUX then
            ## for ifort
-             set optim=" -g -no-ftz -traceback -ftrapuv -fp-stack-check "
-             set optim90=" -g -no-ftz -traceback -ftrapuv -fp-stack-check "
-             set optimtru90=" -g -no-ftz -traceback -ftrapuv -fp-stack-check "
+             set optim=" -DMESOSCALE -g -no-ftz -traceback -ftrapuv -fp-stack-check "
+             set optim90=" -DMESOSCALE -g -no-ftz -traceback -ftrapuv -fp-stack-check "
+             set optimtru90=" -DMESOSCALE -g -no-ftz -traceback -ftrapuv -fp-stack-check "
         else 
            echo "pas d option debug predefinie pour cette machine"

trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_pgf ¶

@@ -180 +180 @@
 else if $LINUX then
 ##-Ktrap=fp
-   set optim90=" -fast -I." 
-   set optimtru90=" -fast -c -Mfree" 
+   set optim90=" -DMESOSCALE -fast -I." 
+   set optimtru90=" -DMESOSCALE -fast -c -Mfree" 
 #   set opt_link=" -Mfree -L/usr/local/pgi/linux86/lib -lpgf90 -lpgftnrtl -lpghpf -lpghpf2 -L$NCDFLIB -lnetcdf -Wl,-Bstatic "
 # Ehouarn: there is no /usr/local/pgi/linux86/lib, but it doesn't matter
@@ -379 +379 @@
            set optim90="$optim90"" -G1 "
         else if $LINUX then
-           set optim90="-g -Mbounds "
+           set optim90="-g -Mbounds -DMESOSCALE "
         else 
            echo "pas d option debug predefinie pour cette machine"

trunk/mesoscale/LMD_MM_MARS/makemeso ¶

@@ -439 +439 @@
        touch callkeys.h.meso  
          ln -sf meso_callkeys.h callkeys.h
-       touch dustlift.F.meso 
-         ln -sf meso_dustlift.F dustlift.F  ## attention avec "ancienne nouvelle physique"
+       #touch dustlift.F.meso 
+       #  ln -sf meso_dustlift.F dustlift.F  ## attention avec "ancienne nouvelle physique"
        touch readtesassim.F90.meso
          ln -sf meso_readtesassim.F90 readtesassim.F90  ## attention idem
@@ -467 +467 @@
   then
     echo 'DEBUG DEBUG DEBUG DEBUG'
-    nohup makegcm_${compilo} -debug -t ${tra} -p mars -d ${physz} meso_testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys 
+    nohup makegcm_${compilo} -debug -t ${tra} -p mars -d ${physz} testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys 
   else
-    nohup makegcm_${compilo} -t ${tra} -p mars -d ${physz} meso_testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
+    nohup makegcm_${compilo} -t ${tra} -p mars -d ${physz} testphys1d | tee libo/log_compile_phys | grep 'warnings' >> libo/log_compile_phys
   fi
   echo ... done

trunk/mesoscale/NOTES.txt ¶

@@ +1 @@
+
+A FAIRE:::: mettre des flags precompilo dans les meso_
+les reporter dans makegcm
 
 changer le renormalisation dans aeropacity ????

trunk/mesoscale/PLOT/MINIMAL/map_latlon.pro ¶

@@ -389 +389 @@
         c_labels=findgen(n_elements(lev))*0., $
 ;        c_charsize=!P.charsize/2, $
-        color=0;50;75;100tropclair;150;0;, $
+        color=75;0;50;75;100tropclair;150;0;, $
 ;       /noerase, $
 ;       xtitle=xtitleset, $

trunk/mesoscale/PLOT/SPEC/MAP/map_uvt.pro ¶

@@ -24 +24 @@
 ;
 if (n_elements(field1) ne 0) then getcdf, file=filename, charvar=field1, invar=cfield1
-u = getget(filename, 'Um', count=[0,0,1,1], offset=[0,0,nlevel,ntime])
-v = getget(filename, 'Vm', count=[0,0,1,1], offset=[0,0,nlevel,ntime])
+if ( (n_elements(overvector_x) ne 0) or (n_elements(field1) eq 0) ) then begin
+   u = getget(filename, 'Um', count=[0,0,1,1], offset=[0,0,nlevel,ntime])
+   v = getget(filename, 'Vm', count=[0,0,1,1], offset=[0,0,nlevel,ntime])
+endif
 getcdf, file=filename, charvar='XLONG', invar=longi
 getcdf, file=filename, charvar='XLAT', invar=lati
@@ -42 +44 @@
         if (no3d ne 'true') then cfield1 = cfield1 (sp:nx-sp-1,sp:ny-sp-1,*,*) else cfield1 = cfield1 (sp:nx-sp-1,sp:ny-sp-1,*)
 endif
-u               = u             (sp:nx-sp-1,sp:ny-sp-1);,*,*) 
-v               = v             (sp:nx-sp-1,sp:ny-sp-1);,*,*)
+if ( (n_elements(overvector_x) ne 0) or (n_elements(field1) eq 0) ) then begin
+  u             = u             (sp:nx-sp-1,sp:ny-sp-1);,*,*) 
+  v             = v             (sp:nx-sp-1,sp:ny-sp-1);,*,*)
+endif
 longi           = longi         (sp:nx-sp-1,sp:ny-sp-1,*)
 lati            = lati          (sp:nx-sp-1,sp:ny-sp-1,*)
@@ -55 +59 @@
 lon = reform(longi(*,*,ntime))
 lat = reform(lati(*,*,ntime))
-overvector_x = u;reform(u(*,*,nlevel,ntime))
-overvector_y = v;reform(v(*,*,nlevel,ntime))
+if (n_elements(overvector_x) ne 0) then begin
+  overvector_x = u;reform(u(*,*,nlevel,ntime))
+  overvector_y = v;reform(v(*,*,nlevel,ntime))
+endif
 if (n_elements(field1) eq 0) then begin
         print, 'field1: horizontal velocity'