Changeset 523 for trunk


Ignore:
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:
2 added
8 edited
1 moved

Legend:

Unmodified
Added
Removed

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

    r520 r523  
    18861886!        endif
    18871887
    1888         call WRITEDIAGFI(ngridmx,'lmax_th',
    1889      &              'hauteur du thermique','K',
    1890      &                         2,lmax_th_out)
     1888        call WRITEDIAGFI(ngridmx,'zmax_th',
     1889     &              'hauteur du thermique','m',
     1890     &                         2,zmax_th)
    18911891        call WRITEDIAGFI(ngridmx,'hfmax_th',
    18921892     &              'maximum TH heat flux','K.m/s',

  • trunk/LMDZ.MARS/makegcm_pgf

    r512 r523  
    2121####  relying on the C-shell environment variables)
    2222# default LMDGCM to where makegcm script is located:
    23 #setenv LMDGCM "`dirname $0`"
     23set scriptdir=`dirname $0`
     24setenv LMDGCM `readlink -f $scriptdir`
    2425# You may set LIBOGCM to something else; otherwise we default to:
    25 #setenv LIBOGCM $LMDGCM/libo
     26setenv LIBOGCM $LMDGCM/libo
    2627## NetCDF Libraries: what follows is OK for LMD 32 and 64bit Linux Machines
    2728#if ( `uname -m` == "x86_64" ) then
    2829## 64 bit machines
    29 #  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
    30 #  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
     30  setenv NCDFLIB /donnees/emlmd/netcdf64-4.0.1_pgi/lib
     31  setenv NCDFINC /donnees/emlmd/netcdf64-4.0.1_pgi/include
    3132#else
    3233#  setenv NCDFLIB /donnees/emlmd/netcdf-4.0.1_pgi/lib
    … …  
    735736cd $localdir
    736737
     738## locate main program (could be in dyn3d or phy$physique
     739##                      and could be .F or .F90)
     740set source_code=${code}.F
     741if ( -f $LMDGCM/libf/dyn3d/${code}.F90 ) then
     742  set source_code=${code}.F90
     743endif
     744if ( -f $LMDGCM/libf/phy${physique}/${code}.F ) then
     745  set source_code=${code}.F
     746endif
     747if ( -f $LMDGCM/libf/phy${physique}/${code}.F90 ) then
     748  set source_code=${code}.F90
     749endif
     750
     751## locate directory where main program is located
     752if ( $dimension == 3 ) then
     753  if ( -f $LMDGCM/libf/dyn3d/${source_code} ) then
     754    set dyn="DIRMAIN=dyn3d "
     755  endif
     756  if ( -f $LMDGCM/libf/phy${physique}/${source_code} ) then
     757    set dyn="DIRMAIN=phy${physique} "
     758  endif
     759endif
     760
    737761echo $make -f $LMDGCM/makefile \
    738762OPTION_DEP="$opt_dep" OPTION_LINK="$opt_link" \
    … …  
    757781MOD_SUFFIX=$mod_suffix \
    758782AR=$ar \
     783SOURCE=$source_code \
    759784PROG=$code
    760785
    … …  
    782807MOD_SUFFIX=$mod_suffix \
    783808AR=$ar \
     809SOURCE=$source_code \
    784810PROG=$code
    785811

  • trunk/LMDZ.MARS/util/compile

    r386 r523  
    88#-L/distrib/local/netcdf/pgi_7.1-6_32/lib -lnetcdf  -o $1.e
    99
    10 ifort $1.F90 \
     10#ifort $1.F90 \
     11pgf90 $1.F90 \
    1112-I$NETCDF/include \
    1213-L$NETCDF/lib -lnetcdf -o $1.e

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

    r386 r523  
    4141scatterers=2
    4242##################
     43tracers=7
     44nx=64
     45ny=48
     46nz=25
     47scatterers=2
     48##################
    4349
    4450

  • trunk/MESOSCALE/LMDZ.MARS.new/makegcm_pgf

    r255 r523  
    1 link ../../LMDZ.MARS/makegcm
     1link ../../LMDZ.MARS/makegcm_pgf

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

    r255 r523  
    22##~~~~~~~~~~~~~~~
    33#Directory where external input files are
    4 datadir = /san/home/spiga/DATAFILE/
     4#datadir = /san/home/spiga/DATAFILE/
    55
    66#Run with or without tracer transport ?

  • trunk/MESOSCALE/LMDZ.MARS/makegcm

    r235 r523  
    1 link makegcm_ifort
     1link makegcm_pgf_new

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

    r510 r523  
    107107state  real  TAU_ICE   ij   misc  1  -  rd   "TAU_ICE"   "CLOUD OD at 825 cm-1 TES"        ""        #SAVEMARS2 tauTES
    108108state  real  PDTZ      ikj  misc  1  -  rd   "PDT"       "TEMP TENDENCY"                   "K s-1"   #SAVEMARS3 pdt
    109 state  real  LMAX_TH   ij   misc  1  -  rd   "LMAX_TH"   "MAXIMUM LEVEL REACHED IN TH"     ""        #SAVEMARS2 lmax_th_out
     109state  real  ZMAX_TH   ij   misc  1  -  rd   "ZMAX_TH"   "MAXIMUM LEVEL REACHED IN TH"     "m"       #SAVEMARS2 zmax_th
    110110state  real  HFMAX_TH  ij   misc  1  -  rd   "HFMAX_TH"  "MAXIMUM TH HEAT FLUX"            "m.K/s"   #SAVEMARS2 hfmax_th
    111111state  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

    r515 r523  
    10641064c   -------------------------------------------
    10651065
    1066       tituscap = .false.
     1066      tituscap = .true.
    10671067      IF (tituscap) THEN
    10681068         PRINT*,'TITUS CAP !!!'
    … …  
    10811081     $              fluxsurf_sw)
    10821082
     1083         IF (tituscap) THEN
     1084           DO ig=1,ngrid
     1085             pdpsrf(ig) = 0.
     1086           ENDDO
     1087         ENDIF
    10831088
    10841089         DO l=1,nlayer
Note: See TracChangeset for help on using the changeset viewer.