Changeset 2358


Ignore:
Timestamp:
Sep 4, 2015, 9:10:16 AM (9 years ago)
Author:
Ehouarn Millour
Message:
  • Correction of xml files to follow up on the new variables added in rev 2333.
  • Added option '-libphy' to makelmdz_fcm to generate a given physics package library (without compiling dynamics or a main program).

EM

Location:
LMDZ5/trunk
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • LMDZ5/trunk/DefLists/field_def_lmdz.xml

    r2282 r2358  
    111111        <field id="du_gwd_rando"    long_name="peu importe"    unit="W/m2" />
    112112        <field id="dv_gwd_rando"    long_name="peu importe"    unit="W/m2" />
    113         <field id="vstr_gwd_rando"    long_name="peu importe"    unit="W/m2" />
     113        <field id="ustr_gwd_hines"    long_name="zonal wind stress Hines gravity waves"    unit="Pa" />
     114        <field id="vstr_gwd_hines"    long_name="meridional wind stress Hines gravity waves"    unit="Pa" />
     115        <field id="ustr_gwd_front"    long_name="zonal wind stress fronts gravity waves"    unit="Pa" />
     116        <field id="vstr_gwd_front"    long_name="meridional wind stress fronts gravity waves"    unit="Pa" />
     117        <field id="ustr_gwd_rando"    long_name="zonal wind stress random gravity waves"    unit="Pa" />
     118        <field id="vstr_gwd_rando"    long_name="meridinal wind stress random gravity waves"    unit="Pa" />
    114119        <field id="sens"    long_name="Sensible heat flux"    unit="W/m2" />
    115120        <field id="fder"    long_name="Heat flux derivation"    unit="W/m2" />
    … …  
    510515        <field id="dulif"    long_name="Orography dU"    unit="m/s2" />
    511516        <field id="dvlif"    long_name="Orography dV"    unit="m/s2" />
    512         <field id="duhin"    long_name="Hines GWD dU"    unit="m/s2" />
    513         <field id="dvhin"    long_name="Hines GWD dV"    unit="m/s2" />
     517        <field id="du_gwd_hines" long_name="Hines GWD dU" unit="m/s2" />
     518        <field id="dv_gwd_hines" long_name="Hines GWD dV" unit="m/s2" />
     519        <field id="du_gwd_front" long_name="Fronts GWD dU" unit="m/s2" />
     520        <field id="dv_gwd_front" long_name="Fronts GWD dV" unit="m/s2" />
     521        <field id="east_gwstress" long_name="Eastward GW Stress" unit="Pa" />
     522        <field id="west_gwstress" long_name="Westward GW Stress" unit="Pa" />
    514523        <field id="dtoro"    long_name="Orography dT"    unit="K/s" />
    515524        <field id="dtlif"    long_name="Orography dT"    unit="K/s" />
    … …  
    693702
    694703</field_definition>
     704

  • LMDZ5/trunk/DefLists/file_def_histLES_lmdz.xml

    r2280 r2358  
    491491                <field field_ref="dulif" level="10" />
    492492                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     493                <field field_ref="du_gwd_hines" level="10" />
     494                <field field_ref="dv_gwd_hines" level="10" />
     495                <field field_ref="du_gwd_front" level="10" />
     496                <field field_ref="dv_gwd_front" level="10" />
     497                <field field_ref="east_gwstress" level="10" />
     498                <field field_ref="west_gwstress" level="10" />
    495499                <field field_ref="dtoro" level="10" />
    496500                <field field_ref="dtlif" level="10" />

  • LMDZ5/trunk/DefLists/file_def_histday_lmdz.xml

    r2280 r2358  
    491491                <field field_ref="dulif" level="10" />
    492492                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     493                <field field_ref="du_gwd_hines" level="10" />
     494                <field field_ref="dv_gwd_hines" level="10" />
     495                <field field_ref="du_gwd_front" level="10" />
     496                <field field_ref="dv_gwd_front" level="10" />
     497                <field field_ref="east_gwstress" level="10" />
     498                <field field_ref="west_gwstress" level="10" />
    495499                <field field_ref="dtoro" level="10" />
    496500                <field field_ref="dtlif" level="10" />

  • LMDZ5/trunk/DefLists/file_def_histhf_lmdz.xml

    r2280 r2358  
    491491                <field field_ref="dulif" level="10" />
    492492                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     493                <field field_ref="du_gwd_hines" level="10" />
     494                <field field_ref="dv_gwd_hines" level="10" />
     495                <field field_ref="du_gwd_front" level="10" />
     496                <field field_ref="dv_gwd_front" level="10" />
     497                <field field_ref="east_gwstress" level="10" />
     498                <field field_ref="west_gwstress" level="10" />
    495499                <field field_ref="dtoro" level="10" />
    496500                <field field_ref="dtlif" level="10" />

  • LMDZ5/trunk/DefLists/file_def_histins_lmdz.xml

    r2280 r2358  
    491491                <field field_ref="dulif" level="10" />
    492492                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     493                <field field_ref="du_gwd_hines" level="10" />
     494                <field field_ref="dv_gwd_hines" level="10" />
     495                <field field_ref="du_gwd_front" level="10" />
     496                <field field_ref="dv_gwd_front" level="10" />
     497                <field field_ref="east_gwstress" level="10" />
     498                <field field_ref="west_gwstress" level="10" />
    495499                <field field_ref="dtoro" level="10" />
    496500                <field field_ref="dtlif" level="10" />

  • LMDZ5/trunk/DefLists/file_def_histmth_lmdz.xml

    r2280 r2358  
    491491                <field field_ref="dulif" level="4" />
    492492                <field field_ref="dvlif" level="4" />
    493                 <field field_ref="duhin" level="4" />
    494                 <field field_ref="dvhin" level="4" />
     493                <field field_ref="du_gwd_hines" level="4" />
     494                <field field_ref="dv_gwd_hines" level="4" />
     495                <field field_ref="du_gwd_front" level="4" />
     496                <field field_ref="dv_gwd_front" level="4" />
     497                <field field_ref="east_gwstress" level="4" />
     498                <field field_ref="west_gwstress" level="4" />
    495499                <field field_ref="dtoro" level="4" />
    496500                <field field_ref="dtlif" level="4" />

  • LMDZ5/trunk/DefLists/file_def_histstn_lmdz.xml

    r2280 r2358  
    491491                <field field_ref="dulif" level="10" />
    492492                <field field_ref="dvlif" level="10" />
    493                 <field field_ref="duhin" level="10" />
    494                 <field field_ref="dvhin" level="10" />
     493                <field field_ref="du_gwd_hines" level="10" />
     494                <field field_ref="dv_gwd_hines" level="10" />
     495                <field field_ref="du_gwd_front" level="10" />
     496                <field field_ref="dv_gwd_front" level="10" />
     497                <field field_ref="east_gwstress" level="10" />
     498                <field field_ref="west_gwstress" level="10" />
    495499                <field field_ref="dtoro" level="10" />
    496500                <field field_ref="dtlif" level="10" />

  • LMDZ5/trunk/bld.cfg

    r2326 r2358  
    3838bld::lib            lmdz
    3939
    40 bld::outfile_ext::exe    %SUFF_NAME.e
    41 bld::target              liblmdz.a
    42 bld::target              %EXEC%SUFF_NAME.e
     40bld::outfile_ext::exe    %SUFF_NAME
     41bld::target              liblmdz.a %EXEC%SUFF_NAME
    4342bld::exe_dep             
    4443
    4544
    4645dir::root            %CONFIG_PATH
    47 dir::lib             %BASE_CONFIG_PATH
     46#dir::lib             %BASE_CONFIG_PATH
    4847dir::bin             %ROOT_PATH/bin
    4948

  • LMDZ5/trunk/libf/phylmd/phys_cal_mod.F90

    r2344 r2358  
    2929  REAL,SAVE    :: jD_ref  ! jour du demarage de la simulation (jour julien)
    3030!$OMP THREADPRIVATE(jD_ref)
     31 CHARACTER (len=10) :: calend ! type of calendar to use
     32                              ! (can be earth_360d, earth_365d or earth_366d)
     33!$OMP THREADPRIVATE(calend)
    3134
    3235
    … …  
    3538  SUBROUTINE phys_cal_init(annee_ref,day_ref)
    3639  USE IOIPSL, ONLY:  ymds2ju
     40  USE ioipsl_getin_p_mod, ONLY: getin_p
    3741  IMPLICIT NONE
    3842    INTEGER,INTENT(IN) :: annee_ref
    3943    INTEGER,INTENT(IN) :: day_ref
    4044
     45    ! Find out which type of calendar we are using
     46    calend = 'earth_360d' ! default
     47    CALL getin_p("calend",calend)
     48     
    4149    CALL ymds2ju(annee_ref, 1, day_ref, 0., jD_ref)
    4250    jD_ref=INT(jD_ref)
    … …  
    6876
    6977END MODULE phys_cal_mod
     78

  • LMDZ5/trunk/libf/phylmd/phys_output_mod.F90

    r2351 r2358  
    3838    USE infotrac_phy, ONLY: nqtot, nqo, niadv, tname, ttext
    3939    USE ioipsl
    40     USE phys_cal_mod, only : hour
     40    USE phys_cal_mod, only : hour, calend
    4141    USE mod_phys_lmdz_para
    4242    USE aero_mod, only : naero_spc,name_aero
    … …  
    565565END MODULE phys_output_mod
    566566
     567

  • LMDZ5/trunk/makelmdz_fcm

    r2336 r2358  
    3434job=1
    3535full=''
     36libphy=false
    3637
    3738LMDGCM=`/bin/pwd`
    … …  
    9798[-j n]                     : active parallel compiling on ntask
    9899[-full]                    : full recompiling
     100[-libphy]                  : only compile physics package (no dynamics or main program)
    99101[-fcm_path path]           : path to the fcm tool (default: tools/fcm/bin)
    100102[-ext_src path]            : path to an additional set of routines to compile with the model
    … …  
    171173      "-ext_src")
    172174          EXT_SRC=$2 ; shift ; shift ;;
     175
    173176      "-j")
    174177          job=$2 ; shift ; shift ;;
     178
    175179      "-full")
    176180          full="-full" ; shift ;;
     181
     182      "-libphy")
     183          libphy="true" ; shift ;;
    177184
    178185      "-arch")
    … …  
    536543fi
    537544
     545if [[ $libphy == "true" ]]
     546then
     547  # special case where we compile only the physics
     548  DYN=$LMDGCM/.void_dir
     549  DYN_COMMON_PATH=$LMDGCM/.void_dir
     550  FILTRE_PATH=$LMDGCM/.void_dir
     551  DYN_PHYS_PATH=$LMDGCM/.void_dir
     552  DYN_PHYS_SUB_PATH=$LMDGCM/.void_dir
     553  #and there is no main program to generate
     554  code=""
     555  SUFF_NAME=""
     556else
     557  SUFF_NAME=${SUFF_NAME}.e
     558fi
     559
    538560cd $LMDGCM
    539561config_fcm="config.fcm"
    … …  
    584606rm -rf config
    585607ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config config
    586 ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/tmp tmp_src
     608ln -s $LIBOGCM/${arch}${SUFF_NAME}/.config/ppsrc tmp_src
    587609
    588610
Note: See TracChangeset for help on using the changeset viewer.