Changeset 661 for CONFIG/LMDZOR


Ignore:
Timestamp:
06/25/09 13:01:48 (13 years ago)
Author:
sdipsl
Message:

Get closer to IPSLCM5_v1. Add 39 levels. Some clean up.

Location:
CONFIG/LMDZOR/branches/LMDZ4OR_v3
Files:
1 added
5 deleted
7 edited
5 moved

Legend:

Unmodified
Added
Removed
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/AA_make

    r602 r661  
    33 
    44all : 
    5         if [ -s ./.resol ] ; then gmake `cat .resol` ; else gmake LMD9671 ; fi 
     5        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else gmake LMD9695 ; fi 
    66 
    7 LMD7245 : libioipsl liborchidee lmdz7245 verif 
     7LMD7245 : libioipsl liborchidee lmdz72x45x19 verif 
    88        echo "LMD7245" >.resol 
     9        echo "RESOL_ATM_3D=72x45x19" >>.resol 
    910        echo "$(LIB_MPI)" >.libmpi 
    1011 
    11 LMD9671 : libioipsl liborchidee lmdz9671 verif 
     12LMD9671 : libioipsl liborchidee lmdz96x71x19 verif 
    1213        echo "LMD9671" >.resol 
     14        echo "RESOL_ATM_3D=96x71x19" >>.resol 
    1315        echo "$(LIB_MPI)" >.libmpi 
    1416 
    15 LMD14496 : libioipsl liborchidee lmdz14496 verif 
    16         echo "LMD14496" >.resol 
     17LMD9695 : libioipsl liborchidee lmdz96x95x19 verif 
     18        echo "ORCA2xLMD9695" >.resol 
     19        echo "RESOL_ATM_3D=96x95x19" >>.resol 
    1720        echo "$(LIB_MPI)" >.libmpi 
    1821 
    19 LMD144142 : libioipsl liborchidee lmdz144142 verif 
     22LMD9695-L39 : libioipsl liborchidee lmdz96x95x39 verif 
     23        echo "ORCA2xLMD9695" >.resol 
     24        echo "RESOL_ATM_3D=96x95x39" >>.resol 
     25        echo "$(LIB_MPI)" >.libmpi 
     26 
     27LMD14496 : libioipsl liborchidee lmdz144x96x19 verif 
     28        echo "LMD14496" >.resol 
     29        echo "RESOL_ATM_3D=144x96x19" >>.resol 
     30        echo "$(LIB_MPI)" >.libmpi 
     31 
     32LMD144142 : libioipsl liborchidee lmdz144x142x19 verif 
    2033        echo "LMD144142" >.resol 
     34        echo "RESOL_ATM_3D=144x142x19" >>.resol 
     35        echo "$(LIB_MPI)" >.libmpi 
     36 
     37LMD144142-L39 : libioipsl liborchidee lmdz144x142x39 verif 
     38        echo "LMD144142" >.resol 
     39        echo "RESOL_ATM_3D=144x142x39" >>.resol 
    2140        echo "$(LIB_MPI)" >.libmpi 
    2241 
     
    4160        (cd ../../modeles/ORCHIDEE; $(M_K) -f Makefile clean) 
    4261 
    43 lmdz7245: 
    44         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 72x45x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_72x45x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; ) 
    45         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 72x45x19 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_72x45x19_phylmd_para_orch.e ../../bin/gcm.e ; ) 
    46 lmdz9671: 
    47         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 96x71x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_96x71x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; ) 
    48         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 96x71x19 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_96x71x19_phylmd_para_orch.e ../../bin/gcm.e ; ) 
    49 lmdz14496: 
    50         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x96x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_144x96x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; ) 
    51         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x96x1 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_144x96x19_phylmd_para_orch.e ../../bin/gcm.e ; ) 
    52 lmdz144142: 
    53         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x142x19 -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_144x142x19_phylmd_seq.e ../../bin/create_etat0_limit.e ; ) 
    54         (cd ../../modeles/LMDZ4; ./makelmdz_fcm -d 144x142x19 -v true -parallel mpi -arch $(FCM_ARCH) gcm ; cp bin/gcm_144x142x19_phylmd_para_orch.e ../../bin/gcm.e ; ) 
     62lmdz72x45x19: 
     63        $(M_K) lmdz RESOL_LMDZ=72x45x19 
     64 
     65lmdz96x71x19: 
     66        $(M_K) lmdz RESOL_LMDZ=96x71x19 
     67 
     68lmdz96x95x19: 
     69        $(M_K) lmdz RESOL_LMDZ=96x95x19 
     70 
     71lmdz96x95x39: 
     72        $(M_K) lmdz RESOL_LMDZ=96x95x39 
     73 
     74lmdz144x96x19: 
     75        $(M_K) lmdz RESOL_LMDZ=144x96x19 
     76 
     77lmdz144x142x19: 
     78        $(M_K) lmdz RESOL_LMDZ=144x142x19 
     79 
     80lmdz144x142x39: 
     81        $(M_K) lmdz RESOL_LMDZ=144x142x39 
     82 
     83lmdz: 
     84        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d $(RESOL_LMDZ) -arch $(FCM_ARCH) create_etat0_limit ; cp bin/create_etat0_limit_$(RESOL_LMDZ)_phylmd_seq.e ../../bin/create_etat0_limit.e ; ) 
     85        (cd ../../modeles/LMDZ4; ./makelmdz_fcm -cpp ORCHIDEE_NOOPENMP -d $(RESOL_LMDZ) -v true -parallel mpi -c $(LIB_MPI) -arch $(FCM_ARCH) gcm ; cp bin/gcm_$(RESOL_LMDZ)_phylmd_para_orch_couple.e ../../bin/gcm.e ; ) 
    5586 
    5687verif: 
     
    5990clean : 
    6091        (rm -rf $(LIBDIR)/* ; rm -f $(BINDIR)/* ; rm -rf ../../modeles/LMDZ4/libo/* ../../modeles/LMDZ4/.lock ; rm -fr .resol .libmpi ; ) 
    61  
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/CREATE/COMP/lmdz.card

    r473 r661  
    2222 
    2323[ParametersFiles] 
    24 List=   (${SUBMIT_DIR}/PARAM/physiq.def, .), \ 
    25         (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM}, gcm.def), \ 
     24List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}, physiq.def), \ 
     25        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D},    gcm.def), \ 
    2626        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    2727        (${SUBMIT_DIR}/PARAM/traceur.def, .)  
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/CREATE/COMP/lmdz.driver

    r332 r661  
    66 
    77    RESOL_ATM=${RESOL} 
     8 
     9    [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19 
     10 
     11    RESOL_ATM_Z=$( echo $RESOL_ATM_3D | awk "-Fx" '{print $3}' ) 
    812 
    913    IGCM_debug_PopStack "ATM_Initialize" 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.card

    r334 r661  
    1414[InitialStateFiles] 
    1515List= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_start.nc,    start.nc) \ 
    16       (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_startphy.nc, startphy.nc)  
     16      (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Restart/${CREATE}_clim_startphy.nc, startphy.nc) 
    1717 
    1818[BoundaryFiles] 
    1919List= ()  
    20 ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_clim_limit.nc, limit.nc)  
     20ListNonDel= (${R_OUT}/${config_UserChoices_TagName}/${CREATE}/ATM/Output/Boundary/${CREATE}_clim_limit.nc, limit.nc) 
    2121 
    2222# With sulfates : 
    23 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1850.cdf, .),\ 
    24 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1900.cdf, .),\ 
    25 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1920.cdf, .),\ 
    26 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1930.cdf, .),\ 
    27 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1940.cdf, .),\ 
    28 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1950.cdf, .),\ 
    29 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1960.cdf, .),\ 
    30 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1970.cdf, .),\ 
    31 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1980.cdf, .),\ 
    32 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1990.cdf, .),\ 
    33 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run2000.cdf, .),\ 
    34 #         (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run.nat.cdf, .),\ 
    35 # 
     23#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1850.cdf, SO4.run1850.nc),\ 
     24#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1900.cdf, SO4.run1900.nc),\ 
     25#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1920.cdf, SO4.run1920.nc),\ 
     26#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1930.cdf, SO4.run1930.nc),\ 
     27#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1940.cdf, SO4.run1940.nc),\ 
     28#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1950.cdf, SO4.run1950.nc),\ 
     29#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1960.cdf, SO4.run1960.nc),\ 
     30#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1970.cdf, SO4.run1970.nc),\ 
     31#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1980.cdf, SO4.run1980.nc),\ 
     32#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run1990.cdf, SO4.run1990.nc),\ 
     33#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run2000.cdf, SO4.run2000.nc),\ 
     34#            (${R_BC}/ATM/${config_UserChoices_TagName}/${RESOL_ATM}/HISTORIQUE/so4.run.nat.cdf, SO4.run.nat.nc),\ 
    3635# With ISSCP engine : 
    3736#         (${R_BC}/ATM/${config_UserChoices_TagName}/ISCCP/tautab.formatted, .),\ 
     
    3938 
    4039[ParametersFiles] 
    41 List=   (${SUBMIT_DIR}/PARAM/physiq.def, .), \ 
    42         (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM}, gcm.def), \ 
     40List=   (${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}, physiq.def), \ 
     41        (${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D}, gcm.def), \ 
    4342        (${SUBMIT_DIR}/PARAM/run.def, .), \ 
    4443        (${SUBMIT_DIR}/PARAM/traceur.def, .), \ 
    45         (${SUBMIT_DIR}/PARAM/Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat, .) 
     44        (${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat, .) 
    4645 
    4746[RestartFiles] 
     
    5049 
    5150[OutputText] 
    52 List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat) 
     51List=   (physiq.def, gcm.def, run.def, traceur.def, Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat) 
    5352 
    5453[OutputFiles] 
     
    6564[Post_1M_histmth] 
    6665Patches= (Patch_20070220_histcom_time_axis) 
    67 GatherWithInternal = (lon, lat, presnivs, time_counter) 
     66GatherWithInternal = (lon, lat, presnivs, time_counter, aire) 
    6867TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, iwp, lwp, LWdnSFC, LWdnSFCclr, LWupSFCclr, LWdn200, LWdn200clr, LWup200, LWup200clr, precip, prw, pluc, psol, q2m, sens, slp, snow, soll0, soll, sols0, sols, SWdnSFC, SWupSFC, SWup200, SWup200clr, SWdnTOA, SWupTOA, SWdn200, SWdn200clr, SWdnSFCclr, SWupSFCclr, SWupTOAclr, t2m, taux_ter, taux_sic, taux_lic, taux_oce, tauy_ter, tauy_sic, tauy_lic, tauy_oce, lat_ter, lat_sic, lat_lic, lat_oce, topl0, topl, tops0, tops, tsol, tsol_ter, tsol_lic, tsol_oce, tsol_sic , u10m, u500, v10m, v500, w500, pourc_ter, pourc_oce, pourc_sic, pourc_lic) 
    6968 
     
    7675Patches = () 
    7776GatherWithInternal = (lon, lat, presnivs, time_counter) 
    78 TimeSeriesVars= (t1000, t925, t850, t700, t600, t500, t400, t300, t250, t200, t150, t100, t70, t50, t30, t20, t10, u1000, u925, u850, u700, u600, u500, u400, u300, u250, u200, u150, u100, u70, u50, u30, u20, u10, v1000, v925, v850, v700, v600, v500, v400, v300, v250, v200, v150, v100, v70, v50, v30, v20, v10, phi1000, phi925, phi850, phi700, phi600, phi500, phi400, phi300, phi250, phi200, phi150, phi100, phi70, phi50, phi30, phi20, phi10, rh1000, rh925, rh850, rh700, rh600, rh500, rh400, rh300, rh250, rh200, rh150, rh100, rh70, rh50, rh30, rh20, rh10, q1000, q925, q850, q700, q600, q500, q400, q300, q250, q200, q150, q100, q70, q50, q30, q20, q10) 
     77TimeSeriesVars= (temp, phi, q, u, v, rh) 
    7978 
    8079[Post_1M_dynzon] 
     
    8685Patches= (Patch_20070220_histcom_time_axis) 
    8786GatherWithInternal = (lon, lat, presnivs, time_counter) 
    88 TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max) 
     87TimeSeriesVars= (bils, cldh, cldl, cldm, cldq, cldt, evap, flat, iwp, lwp, phi500, precip, pluc, plul, prw, psol, rh2m, q2m, sens, sicf, slp, soll, sols, SWdnSFC, taux, tauy, t2m, t2m_max, t2m_min, topl, tops, tsol, u10m, v10m, wind10m, wind10max, u850, v850, w850, phi850, q850, t850, u700, v700, w700, phi700, q700, t700, u500, v500, w500, phi500, q500, t500, u200, v200, w200, phi200, q200, t200) 
    8988 
    9089[Post_HF_histhf] 
    9190Patches= (Patch_20070220_histcom_time_axis) 
    9291GatherWithInternal = (lon, lat, presnivs, time_counter) 
    93 TimeSeriesVars=(cldt, psol, q2m, slp, t2m, rain, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10) 
     92TimeSeriesVars=(cldt, psol, q2m, slp, SWnetOR, SWdownOR, LWdownOR, precip, pluc, plul, prw, t2m, tsol, u10m, v10m, t1000, t925, t850, t700, t500, t300, t250, t200, t150, t100, t50, t30, t10, u1000, u925, u850, u700, u500, u300, u250, u200, u150, u100, u50, u30, u10, v1000, v925, v850, v700, v500, v300, v250, v200, v150, v100, v50, v30, v10, phi1000, phi925, phi850, phi700, phi500, phi300, phi250, phi200, phi150, phi100, phi50, phi30, phi10, w1000, w925, w850, w700, w500, w300, w250, w200, w150, w100, w50, w30, w10, q1000, q925, q850, q700, q500, q300, q250, q200, q150, q100, q50, q30, q10) 
    9493 
    9594[Post_HF_histhf3d] 
    9695Patches= () 
    9796GatherWithInternal = (lon, lat, presnivs, time_counter) 
    98 TimeSeriesVars=(temp, ovap, vitu, vitv) 
     97TimeSeriesVars=(temp, theta, ovap, vitu, vitv) 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/lmdz.driver

    r334 r661  
    88 
    99    RESOL_ATM=${RESOL} 
    10     case ${RESOL_ATM} in 
    11         LMD7245)   BandsResol=72x45x19   ;; 
    12         LMD9671)   BandsResol=96x71x19   ;; 
    13         LMD14496)  BandsResol=144x96x19  ;; 
    14         LMD144142) BandsResol=144x142x19 ;; 
    15     esac 
     10 
     11    [ -f ${SUBMIT_DIR}/../.resol ] && eval $(grep RESOL_ATM_3D ${SUBMIT_DIR}/../.resol) || RESOL_ATM_3D=96x95x19 
     12 
     13    RESOL_ATM_Z=$( echo $RESOL_ATM_3D | awk "-Fx" '{print $3}' ) 
    1614 
    1715    ##- Create_etat0_limit version 
     
    4846 
    4947    ##--Variables used by LMDZ in physiq.def -- 
    50     PAT_INST=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_instan'  ) 
    51     PAT_JOUR=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_journe'  ) 
    52     PAT_MOIS=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'OK_mensuel' ) 
    53     PAT_HFRE=$(     grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def  | grep 'ok_hf'      ) 
    54  
     48    PAT_INST=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_instan='  ) 
     49    PAT_JOUR=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_journe='  ) 
     50    PAT_MOIS=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'OK_mensuel=' ) 
     51    PAT_HFRE=$(      grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ok_hf='      ) 
     52    PAT_ecrit_mth=$( grep -v ^# ${SUBMIT_DIR}/PARAM/physiq.def_L${RESOL_ATM_Z}  | grep 'ecrit_mth='  ) 
    5553    ##--Variables used by LMDZ in gcm.def -- 
    56     PAT_iphysiq=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iphysiq  ) 
    57     PAT_iperiod=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep iperiod  ) 
    58     PAT_day_step=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep day_step ) 
    59     PAT_ecritphy=$( grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM} | grep ecritphy ) 
     54    PAT_iphysiq=$(   grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep iphysiq  ) 
     55    PAT_iperiod=$(   grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep iperiod  ) 
     56    PAT_day_step=$(  grep -v ^# ${SUBMIT_DIR}/PARAM/gcm.def_${RESOL_ATM_3D} | grep day_step ) 
    6057 
    6158    ## Read LMDZ_adjust option in ${compname}.card --> put adjust=y and save Bands_*.dat in ${SUBMIT_DIR}/PARAM 
     
    6764    iperiod=$( echo ${PAT_iperiod} | awk -F= '{print $2}' ) 
    6865    iphysiq=$( echo ${PAT_iphysiq} | awk -F= '{print $2}' ) 
     66    # day_step : number of steps per day (multiple of iperiod) 
     67    #(( day_step = 48 * iphysiq )) 
     68    day_step=$( echo ${PAT_day_step} | awk -F= '{print $2}' ) 
    6969 
    70     # day_step : number of steps per day (multiple of iperiod) 
    71     (( day_step = 48 * iphysiq )) 
     70    #[ -f ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ] && IGCM_sys_Cp ${SUBMIT_DIR}/PARAM/Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat . 
    7271 
    7372    IGCM_debug_PopStack "ATM_Initialize" 
     
    7978    IGCM_debug_PushStack "ATM_Update" 
    8079 
    81     ecritphy=${PeriodLengthInDays} 
     80    ecrit_mth=${PeriodLengthInDays} 
    8281 
    8382    ##-- Remise ou non a zero de la date initiale de LMDZ pour le fichier run.def 
     
    8988 
    9089    ## Mise en forme du fichier physiq.def 
    91     sed -e "s/${PAT_INST}/OK_instan=${OK_instan}/"    \ 
    92         -e "s/${PAT_JOUR}/OK_journe=${OK_journe}/"    \ 
    93         -e "s/${PAT_MOIS}/OK_mensuel=${OK_mensuel}/"  \ 
    94         -e "s/${PAT_HFRE}/ok_hf=${ok_hf}/"            \ 
     90    sed -e "s/${PAT_INST}/OK_instan=${OK_instan}/"      \ 
     91        -e "s/${PAT_JOUR}/OK_journe=${OK_journe}/"      \ 
     92        -e "s/${PAT_MOIS}/OK_mensuel=${OK_mensuel}/"    \ 
     93        -e "s/${PAT_HFRE}/ok_hf=${ok_hf}/"              \ 
     94        -e "s/${PAT_ecrit_mth}/ecrit_mth=${ecrit_mth}/" \ 
    9595        physiq.def > physiq.def.tmp 
    9696    IGCM_sys_Mv physiq.def.tmp physiq.def 
    9797 
    9898    ## Mise en forme du fichier gcm.def 
    99     sed -e "s/${PAT_ecritphy}/ecritphy=${ecritphy}/"  \ 
    100         -e "s/${PAT_day_step}/day_step=${day_step}/"  \ 
    101         -e "s/${PAT_iperiod}/iperiod=${iperiod}/"     \ 
    102         -e "s/${PAT_iphysiq}/iphysiq=${iphysiq}/"     \ 
     99    sed -e "s/${PAT_day_step}/day_step=${day_step}/"    \ 
     100        -e "s/${PAT_iperiod}/iperiod=${iperiod}/"       \ 
     101        -e "s/${PAT_iphysiq}/iphysiq=${iphysiq}/"       \ 
    103102        gcm.def > gcm.def.tmp 
    104103    IGCM_sys_Mv gcm.def.tmp gcm.def 
     
    121120    IGCM_debug_PushStack "ATM_Finalize" 
    122121 
    123     [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${BandsResol}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM 
     122    [ ${LMDZ_adjust} = y ] && IGCM_sys_Cp Bands_${RESOL_ATM_3D}_${NUM_PROC_ATM}prc.dat ${SUBMIT_DIR}/PARAM 
    124123 
    125124    echo FINALIZE ATM ! 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/COMP/orchidee.card

    r326 r661  
    1010        (${R_INIT}/SRF/${config_UserChoices_TagName}/soils_param.nc, .), \ 
    1111        (${R_INIT}/SRF/${config_UserChoices_TagName}/routing.nc, .) 
     12#       (${R_INIT}/SRF/${config_UserChoices_TagName}/PFTmap.1980.nc, pft_new.nc) 
    1213 
    1314[BoundaryFiles] 
     
    1617# For STOMATE : suppress unused lai file and add reftemp file 
    1718#            (${R_BC}/SRF/${config_UserChoices_TagName}/reftemp.nc, .) 
    18  
    1919 
    2020[ParametersFiles] 
     
    2626#  \ 
    2727#       (stomate_rest_out.nc, stomate_rest.nc, stomate_rest_in.nc) 
    28  
    2928 
    3029[OutputText] 
     
    4342[Post_1M_sechiba_history] 
    4443Patches = (Patch_20070220_histcom_time_axis) 
    45 GatherWithInternal = (lon, lat, veget, time_counter) 
    46 TimeSeriesVars = (alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, rain, runoff, snow, snowf, subli, tair, tsol_max, tsol_min, drainage) 
     44GatherWithInternal = (lon, lat, veget, time_counter, Areas) 
     45TimeSeriesVars = (alb_nir, alb_vis, bqsb, evap, fluxlat, fluxsens, gqsb, netrad, qair, lai, rain, runoff, snow, snowf, snownobio, subli, tair, temp_sol, tsol_max, tsol_min, drainage) 
    4746 
    4847[Post_1M_stomate_history] 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/Bands_96x71x19_3prc.dat

    r197 r661  
    1  0  32 
    2  1  32 
    3  2  32 
    4  0  32 
    5  1  32 
    6  2  32 
    7  0  32 
    8  1  32 
    9  2  32 
    10  0  2240 
    11  1  2240 
    12  2  2242 
    13  
     1 0  11 
     2 1  50 
     3 2  11 
     4 0  24 
     5 1  24 
     6 2  24 
     7 0  9 
     8 1  53 
     9 2  10 
     10 0  2245 
     11 1  2241 
     12 2  2236 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_144x142x19

    r660 r661  
    2828## periode de la physique (en pas)                                        
    2929iphysiq=15 
    30 ## frequence (en  jours ) de l'ecriture du fichier histphy                
    31 ecritphy=30 
    3230##  Cycle diurne  ou non                  
    3331cycle_diurne=y 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_144x96x19

    r660 r661  
    2828## periode de la physique (en pas)                                        
    2929iphysiq=15 
    30 ## frequence (en  jours ) de l'ecriture du fichier histphy                
    31 ecritphy=30 
    3230##  Cycle diurne  ou non                  
    3331cycle_diurne=y 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_72x45x19

    r660 r661  
    2828## periode de la physique (en pas)                                        
    2929iphysiq=20 
    30 ## frequence (en  jours ) de l'ecriture du fichier histphy                
    31 ecritphy=30 
    3230##  Cycle diurne  ou non                  
    3331cycle_diurne=y 
  • CONFIG/LMDZOR/branches/LMDZ4OR_v3/LMDZOR/PARAM/gcm.def_96x71x19

    r660 r661  
    2828## periode de la physique (en pas)                                        
    2929iphysiq=10 
    30 ## frequence (en  jours ) de l'ecriture du fichier histphy                
    31 ecritphy=30 
    3230##  Cycle diurne  ou non                  
    3331cycle_diurne=y 
Note: See TracChangeset for help on using the changeset viewer.