Changeset 69


Ignore:
Timestamp:
Feb 18, 2011, 8:17:40 PM (14 years ago)
Author:
aslmd
Message:

README-000-svn: quelques ajouts

LMD_MM_MARS: serie de changements mineurs

A 0 mesoscale/TESTS/TESTCONVEC.tar.gz
ajout cas test convection bubble [tests nuages CO2]

A 0 mesoscale/LMD_MM_MARS/SIMU/deftank/POLAR_NEST_appere.tar.gz
M 68 mesoscale/LMD_MM_MARS/SRC/WPS/wps_mars/geogrid/GEOGRID.TBL.ARW_Mars
A 0 mesoscale/LMD_MM_MARS/SRC/WPS/wps_mars/geogrid/GEOGRID.TBL.ARW_Mars_POLARTESTS
ajout def avec 3 nests dans les regions polaires
changement de GEOGRID.TBL pour prendre en compte valeurs manquantes polaires pour ALB et TI

M 68 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars/compile
M 68 mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars/myGCM/launch_gcm
M 68 mesoscale/LMDZ.MARS/myGCM/callphys.def
par defaut pointe desormais vers initialisation GCM avec cycle de l'eau

M 68 mesoscale/LMD_MM_MARS/SRC/PREP_MARS/readmeteo.F90
pour passer les champ de traceurs eau vapeur et glace a la surface

M 68 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_*
M 68 mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_*
ajout de l'option csh -f pour importer les options de l'environnement courant

D 68 mesoscale/LMDZ.MARS/myGCM/startfi.nc
D 68 mesoscale/LMDZ.MARS/myGCM/start.nc
ne plus synchroniser (change a chaque run... et cree par launch_gcm de toute facon)

Location:
trunk
Files:
3 added
2 deleted
21 edited

Legend:

Unmodified
Added
Removed

  • trunk/000-README-svn

    r52 r69  
    5454                svn update
    5555lorsqu'on revient y travailler apres quelque temps
     56
     57-- pour voir un fichier avec une historique des changements et des personnes "coupables" de ces changements
     58                svn blame **fichier**
     59
     60-- pour ramener un fichier modifie localement a sa version sur le serveur
     61                svn revert **fichier**

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

    r54 r69  
    6969dustbin    = 2
    7070# DUST: Radiatively active dust ? (matters if dustbin>0)
    71 active  = .true.
     71active  = .false. #.true.
    7272# DUST: use mass and number mixing ratios to predict dust size ?
    7373doubleq   = .true.
    … …  
    8383sedimentation = .true.
    8484# WATERICE: Radiatively active transported atmospheric water ice ?
    85 activice   = .true.
     85activice   = .false. #.true.
    8686# WATER: Compute water cycle
    8787water = .true.

  • trunk/mesoscale/LMDZ.MARS/myGCM/callphys.def

    r57 r69  
    1 link ../in_lmdz_mars/myGCM/callphys.def
     1link ../in_lmdz_mars/myGCM/callphys.def.water

  • trunk/mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars/compile

    r11 r69  
    99nz=32
    1010##################
    11 tracers=1
    12 nx=64
    13 ny=48
    14 nz=25
     11#tracers=1
     12#nx=64
     13#ny=48
     14#nz=25
    1515##################
    1616

  • trunk/mesoscale/LMD_MM_MARS/SIMU/in_lmdz_mars/myGCM/launch_gcm

    r11 r69  
    1111#startbase='/d5/aslmd/LMD_MM_MARS_DATA/STARTBASE_64_48_32_t2'
    1212#startbase='/d5/aslmd/LMD_MM_MARS_DATA/old_STARTBASE_64_48_25'
    13 startbase='/d5/aslmd/LMD_MM_MARS_DATA/STARTBASE_64_48_25'
     13#startbase='/d5/aslmd/LMD_MM_MARS_DATA/STARTBASE_64_48_25'
     14startbase='/d5/aslmd/LMD_MM_MARS_DATA/STARTBASE_64_48_32_t2'
    1415##################
    1516

  • trunk/mesoscale/LMD_MM_MARS/SRC/PREP_MARS/readmeteo.F90

    r11 r69  
    8484real, dimension(:,:,:,:), allocatable :: tsoilfile
    8585real, dimension(:,:,:,:), allocatable :: waterfile, watericefile
     86real, dimension(:,:,:), allocatable :: swaterfile, swatericefile
    8687
    8788!! Reading the parameter file
    … …  
    210211allocate(waterfile(lonlen,latlen,altlen,timelen))
    211212allocate(watericefile(lonlen,latlen,altlen,timelen))
     213allocate(swaterfile(lonlen,latlen,timelen))
     214allocate(swatericefile(lonlen,latlen,timelen))
    212215allocate(psfile(lonlen,latlen,timelen))
    213216allocate(tsfile(lonlen,latlen,timelen))
    … …  
    236239waterfile(:,:,:,:)=0
    237240watericefile(:,:,:,:)=0
     241swaterfile(:,:,:)=0
     242swatericefile(:,:,:)=0
    238243psfile(:,:,:)=0
    239244tsfile(:,:,:)=0
    … …  
    559564    endif
    560565    ierr=NF_GET_VAR_REAL(nid,nvarid,watericefile)
     566
     567    print *,'Surface Water vapor'
     568    ierr=NF_INQ_VARID(nid,"qsurf02",nvarid)
     569    if (ierr.ne.NF_NOERR) then
     570      write(*,*) "...No qsurf02 - surface Water vapor set to 0"
     571      swaterfile(:,:,:)=0.
     572    endif
     573    ierr=NF_GET_VAR_REAL(nid,nvarid,swaterfile)
     574
     575    print *,'Surface Water ice'
     576    ierr=NF_INQ_VARID(nid,"qsurf01",nvarid)
     577    if (ierr.ne.NF_NOERR) then
     578      write(*,*) "...No qsurf01 - surface Water ice set to 0"
     579      swatericefile(:,:,:)=0.
     580    endif
     581    ierr=NF_GET_VAR_REAL(nid,nvarid,swatericefile)
    561582!!------------------------
    562583!! special water stuff
    … …  
    9831004DESC='Water vapor'
    9841005XLVL=200100.
    985 SLAB=waterfile(:,:,1,time_out(l))
     1006!SLAB=waterfile(:,:,1,time_out(l))
     1007SLAB=swaterfile(:,:,time_out(l))
    9861008        ! And now put everything in the destination file
    9871009        ! ... Header
    … …  
    10011023DESC='Water ice'
    10021024XLVL=200100.
    1003 SLAB=watericefile(:,:,1,time_out(l))
     1025!SLAB=watericefile(:,:,1,time_out(l))
     1026SLAB=swatericefile(:,:,time_out(l))
    10041027        ! And now put everything in the destination file
    10051028        ! ... Header
    … …  
    12381261deallocate(waterfile)
    12391262deallocate(watericefile)
     1263deallocate(swaterfile)
     1264deallocate(swatericefile)
    12401265deallocate(psfile)
    12411266deallocate(tsfile)

  • trunk/mesoscale/LMD_MM_MARS/SRC/WPS/wps_mars/geogrid/GEOGRID.TBL.ARW_Mars

    r11 r69  
    9797#       fill_missing=400. #north polar TI (needed with thermal_TES)
    9898#        fill_missing=180. #polar projection artefacts
     99        fill_missing=4100. #north polar TI (needed with thermal_TES 64ppd)
    99100===============================
    100101name = ALBEDO_GCM
    … …  
    113114        rel_path=       64ppd_noHRti:albedo_TES/
    114115#        fill_missing=0.35 #north polar alb (needed with albedo_TES - albedo_GCM/1.3 to be consistent)
     116        fill_missing=0.325 #north polar alb (needed with albedo_TES 64 ppd)
    115117        interp_option = custom:sixteen_pt+four_pt
    116118        rel_path=       custom:albedo_TES/

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_g95

    r11 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_gnu

    r11 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_ifort

    r11 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

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

    r11 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_mpifort

    r65 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd/makegcm_pgf

    r11 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm.last

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

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

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

  • trunk/mesoscale/LMD_MM_MARS/SRC/WRFV2/mars_lmd_new/makegcm_g95.last

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

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

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

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

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

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

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo

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

    r48 r69  
    1 #!/bin/csh
     1#!/bin/csh -f
    22# $Header: /users/lmdz/cvsroot/LMDZ.3.3/makegcm,v 1.21 2001/07/04 08:41:44 lmdz Exp $
    33#set verbose echo
Note: See TracChangeset for help on using the changeset viewer.