Changeset 86 for trunk/mesoscale/PLOT/SPEC/MAP

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

File:

• trunk/mesoscale/PLOT/SPEC/MAP/map_uvt.pro (modified) (3 diffs)

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'