Changeset 523

Timestamp:

Feb 10, 2012, 6:47:12 PM (13 years ago)

Author:

aslmd

Message:

LMDZ.MARS and MESOSCALE: various minor improvements of workflow. no particularly interesting stuff. the only thing to note is that makegcm is renamed makegcm_pgf to be clearer.

Location:

trunk

Files:

• LMDZ.MARS/libf/phymars/physiq.F (modified) (1 diff)
• LMDZ.MARS/makegcm_pgf (moved) (moved from trunk/LMDZ.MARS/makegcm) (4 diffs)
• LMDZ.MARS/util/compile (modified) (1 diff)
• MESOSCALE/LMDZ.MARS.new/in_lmdz_mars_newphys/compile (modified) (1 diff)
• MESOSCALE/LMDZ.MARS.new/makegcm_pgf (modified) (1 diff)
• MESOSCALE/LMDZ.MARS.new/myGCM/DEFS_JB/callphys.def (modified) (1 diff)
• MESOSCALE/LMDZ.MARS/libf_gcm/phymars/scatterers (added)
• MESOSCALE/LMDZ.MARS/makegcm (modified) (1 diff)
• MESOSCALE/LMDZ.MARS/makegcm_pgf_new (added)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM (modified) (1 diff)
• MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/libf/phymars/physiq.F (modified) (2 diffs)

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

@@ -1886 +1886 @@
 !        endif
 
-        call WRITEDIAGFI(ngridmx,'lmax_th',
-     &              'hauteur du thermique','K',
-     &                         2,lmax_th_out)
+        call WRITEDIAGFI(ngridmx,'zmax_th',
+     &              'hauteur du thermique','m',
+     &                         2,zmax_th)
         call WRITEDIAGFI(ngridmx,'hfmax_th',
      &              'maximum TH heat flux','K.m/s',

trunk/LMDZ.MARS/makegcm_pgf

@@ -21 +21 @@
 ####  relying on the C-shell environment variables)
 # default LMDGCM to where makegcm script is located:
-#setenv LMDGCM "`dirname $0`"
+set scriptdir=`dirname $0`
+setenv LMDGCM `readlink -f $scriptdir`
 # You may set LIBOGCM to something else; otherwise we default to:
-#setenv LIBOGCM $LMDGCM/libo
+setenv LIBOGCM $LMDGCM/libo
 ## NetCDF Libraries: what follows is OK for LMD 32 and 64bit Linux Machines
 #if ( `uname -m` == "x86_64" ) then
 ## 64 bit machines
-#  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
-#  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
+  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
+  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
 #else
 #  setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_pgi/lib
@@ -735 +736 @@
 cd $localdir
 
+## locate main program (could be in dyn3d or phy$physique
+##                      and could be .F or .F90)
+set source_code=${code}.F
+if ( -f $LMDGCM/libf/dyn3d/${code}.F90 ) then
+  set source_code=${code}.F90
+endif
+if ( -f $LMDGCM/libf/phy${physique}/${code}.F ) then
+  set source_code=${code}.F
+endif
+if ( -f $LMDGCM/libf/phy${physique}/${code}.F90 ) then
+  set source_code=${code}.F90
+endif
+
+## locate directory where main program is located
+if ( $dimension == 3 ) then
+  if ( -f $LMDGCM/libf/dyn3d/${source_code} ) then
+    set dyn="DIRMAIN=dyn3d "
+  endif
+  if ( -f $LMDGCM/libf/phy${physique}/${source_code} ) then
+    set dyn="DIRMAIN=phy${physique} "
+  endif
+endif
+
 echo $make -f $LMDGCM/makefile \
 OPTION_DEP="$opt_dep" OPTION_LINK="$opt_link" \
@@ -757 +781 @@
 MOD_SUFFIX=$mod_suffix \
 AR=$ar \
+SOURCE=$source_code \
 PROG=$code
 
@@ -782 +807 @@
 MOD_SUFFIX=$mod_suffix \
 AR=$ar \
+SOURCE=$source_code \
 PROG=$code
 

trunk/LMDZ.MARS/util/compile

@@ -8 +8 @@
 #-L/distrib/local/netcdf/pgi_7.1-6_32/lib -lnetcdf  -o $1.e
 
-ifort $1.F90 \
+#ifort $1.F90 \
+pgf90 $1.F90 \
 -I$NETCDF/include \
 -L$NETCDF/lib -lnetcdf -o $1.e

trunk/MESOSCALE/LMDZ.MARS.new/in_lmdz_mars_newphys/compile

@@ -41 +41 @@
 scatterers=2
 ##################
+tracers=7
+nx=64
+ny=48
+nz=25
+scatterers=2
+##################
 
 

trunk/MESOSCALE/LMDZ.MARS.new/makegcm_pgf

@@ -1 @@
-link ../../LMDZ.MARS/makegcm
+link ../../LMDZ.MARS/makegcm_pgf

trunk/MESOSCALE/LMDZ.MARS.new/myGCM/DEFS_JB/callphys.def

@@ -2 +2 @@
 ##~~~~~~~~~~~~~~~
 #Directory where external input files are
-datadir = /san/home/spiga/DATAFILE/ 
+#datadir = /san/home/spiga/DATAFILE/ 
 
 #Run with or without tracer transport ?

trunk/MESOSCALE/LMDZ.MARS/makegcm

@@ -1 @@
-link makegcm_ifort
+link makegcm_pgf_new

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/Registry/Registry.EM

@@ -107 +107 @@
 state  real  TAU_ICE   ij   misc  1  -  rd   "TAU_ICE"   "CLOUD OD at 825 cm-1 TES"        ""        #SAVEMARS2 tauTES
 state  real  PDTZ      ikj  misc  1  -  rd   "PDT"       "TEMP TENDENCY"                   "K s-1"   #SAVEMARS3 pdt
-state  real  LMAX_TH   ij   misc  1  -  rd   "LMAX_TH"   "MAXIMUM LEVEL REACHED IN TH"     ""        #SAVEMARS2 lmax_th_out
+state  real  ZMAX_TH   ij   misc  1  -  rd   "ZMAX_TH"   "MAXIMUM LEVEL REACHED IN TH"     "m"       #SAVEMARS2 zmax_th
 state  real  HFMAX_TH  ij   misc  1  -  rd   "HFMAX_TH"  "MAXIMUM TH HEAT FLUX"            "m.K/s"   #SAVEMARS2 hfmax_th
 state  real  WSTAR     ij   misc  1  -  rd   "WSTAR"     "FREE CONVECTION VELOCITY FROM TH" "m/s"    #SAVEMARS2 wstar

trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/libf/phymars/physiq.F

@@ -1064 +1064 @@
 c   -------------------------------------------
 
-      tituscap = .false.
+      tituscap = .true.
       IF (tituscap) THEN
          PRINT*,'TITUS CAP !!!'
@@ -1081 +1081 @@
      $              fluxsurf_sw) 
 
+         IF (tituscap) THEN 
+           DO ig=1,ngrid
+             pdpsrf(ig) = 0.
+           ENDDO
+         ENDIF
 
          DO l=1,nlayer