Changeset 426


Ignore:
Timestamp:
Nov 28, 2011, 10:59:33 AM (13 years ago)
Author:
aslmd
Message:

LMDZ.MARS: corrected wrong datafile default link. MESOSCALE: added 4 to 5 nests files. GRAPHICS: added geo files handling. LMDZ.GENERIC: replaced makegcm by a symboli link to makegcm_whateverversion.

Location:
trunk
Files:
7 added
2 deleted
8 edited

Legend:

Unmodified
Added
Removed

  • trunk/LMDZ.GENERIC/README

    r375 r426  
    254254>>> Modified 'makegcm' and makegcm_g95' so that modules files are put
    255255    with libraries (and not in current directory)
    256    
    257    
    258    
     256
     257==
     258== WORK FOR GENERIC MODEL STARTS HERE
     259==
    259260   
    260261== 01/08/09 ==

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

    r420 r426  
    135135
    136136         write(*,*) "Directory where external input files are:"
    137          datafile="/data/fgglmd/datagcm/datafile"
     137         datafile="/u/forget/WWW/datagcm/datafile"
    138138         call getin("datadir",datafile) ! default path
    139139         write(*,*) " datafile = ",trim(datafile)

  • trunk/MESOSCALE/LMD_MM_MARS/SIMU/runmeso

    r390 r426  
    622622        cd ${simu_folder}
    623623        rm -rf ${simu_folder}/wrfout*
    624         if [[ ${compilo} -eq 3 ]]
     624        if [[ ${compilo} -eq 5 ]]
    625625        then
    626626                ulimit -s unlimited

  • trunk/MESOSCALE/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_mpi

    r341 r426  
    493493cp -f $libf/grid/dimensions.h $libf/grid/d3_dimensions.h
    494494cp -f $libf/grid/dimensions.h $libf/grid/d4_dimensions.h
    495 
     495cp -f $libf/grid/dimensions.h $libf/grid/d5_dimensions.h
    496496
    497497cd $LMDGCM

  • trunk/MESOSCALE_DEV/BENCH

    r355 r426  
    115115Timing for main: time 2024-01-17_03:05:00 on domain   1:    0.29685 elapsed seconds.
    116116
     117**** ULRICH + IFORT [open MPI ciclad]
     118*************************************
     119Timing for Writing wrfout_d01_2024-01-17_03:00:00 for domain        1:    0.03150 elapsed seconds.
     120Timing for processing lateral boundary for domain        1:    0.00600 elapsed seconds.
     121Timing for main: time 2024-01-17_03:00:50 on domain   1:    0.37020 elapsed seconds.
     122Timing for main: time 2024-01-17_03:01:00 on domain   1:    0.26710 elapsed seconds.
     123Timing for main: time 2024-01-17_03:01:50 on domain   1:    0.33070 elapsed seconds.
     124Timing for main: time 2024-01-17_03:02:00 on domain   1:    0.26710 elapsed seconds.
     125Timing for main: time 2024-01-17_03:02:50 on domain   1:    0.33040 elapsed seconds.
     126Timing for main: time 2024-01-17_03:03:00 on domain   1:    0.26650 elapsed seconds.
     127Timing for main: time 2024-01-17_03:03:50 on domain   1:    0.33100 elapsed seconds.
     128Timing for main: time 2024-01-17_03:04:00 on domain   1:    0.26700 elapsed seconds.
     129Timing for main: time 2024-01-17_03:04:50 on domain   1:    0.32990 elapsed seconds.
     130Timing for main: time 2024-01-17_03:05:00 on domain   1:    0.26660 elapsed seconds.
     131
    117132**** FERME UPMC [gnome iDataPlex] + IFORT
    118133*****************************************
    … …  
    129144Timing for main: time 2024-01-17_03:04:50 on domain   1:    0.35210 elapsed seconds.
    130145Timing for main: time 2024-01-17_03:05:00 on domain   1:    0.25240 elapsed seconds.
     146
     147**** ULRICH + IFORT [open MPI ciclad] 8 procs
     148*********************************************
     149Timing for Writing wrfout_d01_2024-01-17_03:00:00 for domain        1:    0.05560 elapsed seconds.
     150Timing for processing lateral boundary for domain        1:    0.01020 elapsed seconds.
     151Timing for main: time 2024-01-17_03:00:50 on domain   1:    0.39620 elapsed seconds.
     152Timing for main: time 2024-01-17_03:01:00 on domain   1:    0.29870 elapsed seconds.
     153Timing for main: time 2024-01-17_03:01:50 on domain   1:    0.32720 elapsed seconds.
     154Timing for main: time 2024-01-17_03:02:00 on domain   1:    0.27110 elapsed seconds.
     155Timing for main: time 2024-01-17_03:02:50 on domain   1:    0.34010 elapsed seconds.
     156Timing for main: time 2024-01-17_03:03:00 on domain   1:    0.27070 elapsed seconds.
     157Timing for main: time 2024-01-17_03:03:50 on domain   1:    0.32590 elapsed seconds.
     158Timing for main: time 2024-01-17_03:04:00 on domain   1:    0.26950 elapsed seconds.
     159Timing for main: time 2024-01-17_03:04:50 on domain   1:    0.32590 elapsed seconds.
     160Timing for main: time 2024-01-17_03:05:00 on domain   1:    0.27030 elapsed seconds.
    131161
    132162**** PENN [nouvelle ferme de calcul] + PGF90 [MPI sur 1 proc seulement]

  • trunk/UTIL/PYTHON/myplot.py

    r425 r426  
    726726             "def":          "spectral",\
    727727             "HGT":          "spectral",\
     728             "HGT_M":        "spectral",\
    728729             "TK":           "gist_heat",\
    729730             "TPOT":         "Paired",\

  • trunk/UTIL/PYTHON/planetoplot.py

    r425 r426  
    139139          else:                           errormess("no time axis found.")
    140140          vert = nc.variables["altitude"][:]
    141       elif typefile in ['meso','mesoapi']:
     141      elif typefile in ['meso','mesoapi','geo']:
    142142          if vlon is not None or vlat is not None:   indices = bidimfind(lon2d,lat2d,vlon,vlat) ; print '********** INDICES: ', indices
    143143          if slon is not None: slon[0][0] = indices[0] ; slon[0][1] = indices[0]
    … …  
    150150          else:                 londim='WEST-EAST_PATCH_END_UNSTAG'
    151151          lon = np.arange(0,getattr(nc,londim),1) ; lat = np.arange(0,getattr(nc,latdim),1)
    152           if vertmode is None:  vertmode=0
    153           if vertmode == 0:     vert = np.arange(0,getattr(nc,vertdim),1)
    154           else:                 vert = nc.variables["vert"][:]
    155152          time = np.arange(0,len(nc.variables["Times"]),1)
     153          if typefile in ['geo']:   vert = [0.] ; stime = readslices(str(0))
     154          else:
     155              if vertmode is None:  vertmode=0
     156              if vertmode == 0:     vert = np.arange(0,getattr(nc,vertdim),1)
     157              else:                 vert = nc.variables["vert"][:]
    156158       #if firstfile:
    157159       #   lat0 = lat
    … …  
    230232    print "********************************************"
    231233    while error is False:
    232        print "********** nplot", nplot, "error",error
     234       print "********** NPLOT", nplot
    233235     
    234236       ### General plot settings
    … …  
    247249       indexlat  = getsindex(slat,((nplot-1)//nlon)%nlat,lat)
    248250       indexvert = getsindex(svert,((nplot-1)//(nlon*nlat))%nvert,vert)
    249 
    250251       if ope is not None:
    251252           if fileref is not None:      index_f = ((nplot-1)//(nlon*nlat*nvert*ntime))%(len(namefiles)+2)  ## OK only 1 var,  see test in the beginning
    … …  
    261262       if mapmode == 1 and stime is None:   indextime = 1
    262263       else:                                indextime = getsindex(stime,((nplot-1)//(nlon*nlat*nvert))%ntime,time)
     264       ltst = None
    263265       if typefile in ['mesoapi','meso'] and indextime is not None:  ltst = localtime ( interv[0]+indextime*interv[1], 0.5*(wlon[0]+wlon[1]) ) 
    264266       print "********** index lon, lat, vert, time ",indexlon,indexlat,indexvert,indextime
    … …  
    329331                     if mapmode == 1:       m.pcolor( x, y, what_I_plot, cmap = palette, vmin=zevmin, vmax=zevmax )
    330332                     elif mapmode == 0:     pcolor( x, y, what_I_plot, cmap = palette, vmin=zevmin, vmax=zevmax )
    331                  if colorb != 'nobar' and varname != 'HGT' :       
    332                      if (fileref is not None) and (index_f is numplot-1):
    333                         colorbar(fraction=0.05,pad=0.03,format="%.3f",\
    334                                            ticks=np.linspace(zevmin,zevmax,num=min([ticks/2+1,20])),\
    335                                            extend='neither',spacing='proportional')
    336                      else:
    337                         colorbar(fraction=0.05,pad=0.03,format=fmtvar(fvar.upper()),\
    338                                            ticks=np.linspace(zevmin,zevmax,num=min([ticks/2+1,20])),\
    339                                            extend='neither',spacing='proportional')
    340                                            # both min max neither
     333                 if colorb != 'nobar':       
     334                     if (fileref is not None) and (index_f is numplot-1):   daformat = "%.3f"
     335                     else:                                                  daformat = fmtvar(fvar.upper())
     336                     colorbar( fraction=0.05,pad=0.03,format=daformat,\
     337                               ticks=np.linspace(zevmin,zevmax,num=min([ticks/2+1,20])),extend='neither',spacing='proportional' )
    341338               ##### 1D field
    342339               elif len(what_I_plot.shape) is 1:
    … …  
    346343               #### Other cases: (maybe plot 3-D field one day or movie ??)
    347344               else:
    348                  print "WARNING!!! ",len(what_I_plot.shape),"-D PLOT NOT SUPPORTED !!!"
    349                  print "field dimensions: ", what_I_plot.shape
    350                  exit()
    351                
     345                 print "WARNING!!! ",len(what_I_plot.shape),"-D PLOT NOT SUPPORTED !!! dimensions: ",what_I_plot.shape
     346                 errormess("Are you sure you did not forget to prescribe a dimension ?")
    352347           else:
    353348               errormess("There is an error in reducing field !")
    … …  
    382377            if addchar: 
    383378                [addchar,gogol,gogol2] = getlschar ( all_namefile[index_f] )
    384                 plottitle = plottitle + addchar + "_LT"+str(ltst)
    385             else:        plottitle = plottitle + "_LT"+str(ltst)
     379                plottitle = plottitle + addchar + "_LT"
     380            else:        plottitle = plottitle + "_LT"
     381            if ltst is not None: plottitle = plottitle + str(ltst)
    386382       else:
    387383            if fileref is not None:

  • trunk/UTIL/PYTHON/pp.py

    r424 r426  
    4040      zefiles = separatenames(opt.file[i])
    4141
    42       typefile = whatkindfile(Dataset(zefiles[0]))
    43       stralt = None
     42      typefile = whatkindfile(Dataset(zefiles[0])) ; stralt = None
    4443      if typefile in ["meso","mesoapi"]:         
    4544          [lschar,zehour,zehourin] = getlschar ( zefiles[0] )
    46           if opt.var is None:  opt.var = ["HGT"]
     45          if opt.var is None:  opt.var = ["HGT"] ; opt.clb = "nobar"
     46      elif typefile == "geo":
     47          [lschar,zehour,zehourin] = ["",0,0]
     48          if opt.var is None:  opt.var = ["HGT_M"] ; opt.clb = "nobar"
    4749      else:                                       
    4850          [lschar,zehour,zehourin] = ["",0,0]
    49           if opt.var is None:  opt.var = ["phisinit"]
     51          if opt.var is None:  opt.var = ["phisinit"] ; opt.clb = "nobar"
    5052
    5153      if opt.vmin is not None : zevmin  = opt.vmin[min(i,len(opt.vmin)-1)]
Note: See TracChangeset for help on using the changeset viewer.