Changeset 2690


Ignore:
Timestamp:
12/18/15 10:36:27 (5 years ago)
Author:
aclsce
Message:
  • Adapted xml files and cards to new NEMO revision
  • Fixed small bugs in lmdz.card and AA_make
Location:
CONFIG/UNIFORM/v6/IPSLCM6
Files:
8 edited

Legend:

Unmodified
Added
Removed
  • CONFIG/UNIFORM/v6/IPSLCM6/AA_make

    r2687 r2690  
    99 
    1010all :  
    11         if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else $(M_K) IPSLCM6A-LR ; fi 
     11        if [ -s ./.resol ] ; then $(M_K) `head -1 .resol` ; else $(M_K) IPSLCM6-LR ; fi 
    1212 
    1313IPSLCM6A-VLR :   
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lim2.card

    r2674 r2690  
    3131Patches = () 
    3232GatherWithInternal = (nav_lon, nav_lat, time_counter, time_centered, time_centered_bounds) 
    33 TimeSeriesVars2D = (ice_pres, iicetemp, iicethic, iicevelu, iicevelv, isnowthi) 
     33TimeSeriesVars2D = (snthic, sithic, sivolu, snvolu, siconc, sisali, sitemp, sistem, siheco, snheco, siages, sivelu, sivelv, sivelo, sishea, sibrin, vfxice, vfxsnw, vfxspr, vfxsub, hfxout, hfxin, sfx) 
    3434ChunckJob2D = NONE 
    3535TimeSeriesVars3D = () 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/lmdz.card

    r2674 r2690  
    145145[Post_1M_paramLMDZ_phy] 
    146146Patches=() 
    147 GatherWithInternal = (lon, lat, time_centered, time_centered_bounds) 
     147GatherWithInternal = (lon, lat, time_counter, time_counter_bnds) 
    148148TimeSeriesVars2D =(R_ecc,  R_peri, R_incl, solaire, co2_ppm, CH4_ppb, N2O_ppb, CFC11_ppt, CFC12_ppt) 
    149149ChunckJob2D = NONE 
  • CONFIG/UNIFORM/v6/IPSLCM6/EXPERIMENTS/IPSLCM/piControl/COMP/pisces.card

    r2685 r2690  
    1111List=   () 
    1212 
    13 # ORCA2.3 
    14 ListNonDel= (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DIC_nomask.nc     , . ), \ 
    15             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Alkalini_nomask.nc, . ), \ 
    16             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_O2_nomask.nc      , . ), \ 
    17             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_NO3_nomask.nc     , . ), \ 
    18             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_PO4_nomask.nc     , . ), \ 
    19             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Si_nomask.nc      , . ), \ 
    20             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DOC_nomask.nc     , . ), \ 
    21             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Fer_nomask.nc     , . ), \ 
    22             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/kRGB61.txt             , . ), \ 
    23             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/dust.orca.nc           , . ), \ 
    24             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/bathy.orca.nc          , . ), \ 
    25             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/river.orca.nc          , . ), \ 
    26             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/ndeposition.orca.nc    , . ), \ 
    27             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/par.orca.nc            , . ), \ 
    28             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/solubility.orca.nc    , . ) 
     13# # ORCA2.3 
     14# ListNonDel= (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DIC_nomask.nc     , . ), \ 
     15#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Alkalini_nomask.nc, . ), \ 
     16#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_O2_nomask.nc      , . ), \ 
     17#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_NO3_nomask.nc     , . ), \ 
     18#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_PO4_nomask.nc     , . ), \ 
     19#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Si_nomask.nc      , . ), \ 
     20#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DOC_nomask.nc     , . ), \ 
     21#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Fer_nomask.nc     , . ), \ 
     22#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/kRGB61.txt             , . ), \ 
     23#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/dust.orca.nc           , . ), \ 
     24#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/bathy.orca.nc          , . ), \ 
     25#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/river.orca.nc          , . ), \ 
     26#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/ndeposition.orca.nc    , . ), \ 
     27#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/par.orca.nc            , . ), \ 
     28#             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/solubility.orca.nc    , . ) 
    2929 
    30 # eORCA1.0 
    31 # ListNonDel = (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DIC_annual.nc            , . ), \ 
    32 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Alkalini_annual.nc       , . ), \ 
    33 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_O2_monthly.nc            , . ), \ 
    34 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_PO4_monthly.nc           , . ), \ 
    35 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Si_monthly.nc            , . ), \ 
    36 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DOC_monthly.nc           , . ), \ 
    37 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Fer_monthly.nc           , . ), \ 
    38 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_NO3_monthly.nc           , . ), \ 
    39 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/dust.orca.nc                  , . ), \ 
    40 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/river_global_news.nc          , . ), \ 
    41 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/ndeposition.orca.nc           , . ), \ 
    42 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/par.orca.nc                   , . ), \ 
    43 #              (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/solubility.orca.nc            , . ) 
     30#eORCA1.0 
     31ListNonDel = (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DIC_annual.nc            , . ), \ 
     32             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Alkalini_annual.nc       , . ), \ 
     33             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_O2_monthly.nc            , . ), \ 
     34             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_PO4_monthly.nc           , . ), \ 
     35             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Si_monthly.nc            , . ), \ 
     36             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_DOC_monthly.nc           , . ), \ 
     37             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_Fer_monthly.nc           , . ), \ 
     38             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/data_NO3_monthly.nc           , . ), \ 
     39             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/dust.orca.nc                  , . ), \ 
     40             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/river_global_news.nc          , . ), \ 
     41             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/ndeposition.orca.nc           , . ), \ 
     42             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/par.orca.nc                   , . ), \ 
     43             (${R_IN}/OCE/${config_UserChoices_TagName}/${opa9_UserChoices_ORCA_version}/solubility.orca.nc            , . ) 
    4444 
    4545                                                                                   
     
    7676[Post_1M_ptrc_T] 
    7777Patches = () 
    78 GatherWithInternal = (nav_lon, nav_lat, time_counter, time_centered, time_centered_bounds) 
     78GatherWithInternal = (nav_lon, nav_lat, time_counter, time_instant, time_instant_bounds) 
    7979TimeSeriesVars2D = () 
    8080ChunckJob2D = 100Y 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/context_nemo.xml

    r2560 r2690  
    4949     <grid id="grid_W_2D" domain_ref="grid_W"/> 
    5050     <grid id="grid_W_3D" domain_ref="grid_W" axis_ref="depthw"/> 
     51     <grid id="gznl_T_2D" domain_ref="gznl"/>  
     52     <grid id="gznl_T_3D" domain_ref="gznl" axis_ref="deptht"/>  
     53     <grid id="gznl_W_3D" domain_ref="gznl" axis_ref="depthw"/> 
    5154    </grid_definition>    
    5255  </context> 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/domain_def_nemo.xml

    r2372 r2690  
    170170      </domain_group> 
    171171 
     172      <domain_group id="gznl">  
     173         <domain id="ptr" long_name="zonal mean grid" zoom_ibegin="0000"  zoom_jbegin="1" zoom_ni="1" zoom_nj="0000" />  
     174      </domain_group> 
     175 
    172176      <domain_group id="scalarpoint"> 
    173177         <domain id="scalarpoint" long_name="scalar"/> 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/PARAM/file_def_nemo.xml

    r2685 r2690  
    134134    <field field_ref="icevolu"          name="sivolu"  /> 
    135135    <field field_ref="snowvol"          name="snvolu"  /> 
    136     <field field_ref="iceconc"          name="siconc"  /> 
     136    <field field_ref="iiceconc"          name="siconc"  /> 
    137137     
    138138    <field field_ref="vfxbog"          name="vfxbog" /> 
     
    320320    <field field_ref="icevolu"          name="sivolu" /> 
    321321    <field field_ref="snowvol"          name="snvolu" /> 
    322     <field field_ref="iceconc"          name="siconc"  /> 
     322    <field field_ref="iiceconc"          name="siconc"  /> 
    323323 
    324324    <field field_ref="vfxbog"          name="vfxbog" /> 
     
    472472 
    473473  </file> 
     474 
     475    <file id="file16" name_suffix="_diaptr" description="diaptr variables" > 
     476       <field field_ref="zotemglo"   /> 
     477       <field field_ref="zosalglo"     /> 
     478       <field field_ref="zosrfglo"    /> 
     479       <field field_ref="zomsfglo"    /> 
     480       <field field_ref="zotematl"   /> 
     481       <field field_ref="zosalatl"     /> 
     482       <field field_ref="zosrfatl"    /> 
     483       <field field_ref="zomsfatl"    /> 
     484       <field field_ref="zotempac"   /> 
     485       <field field_ref="zosalpac"     /> 
     486       <field field_ref="zosrfpac"    /> 
     487       <field field_ref="zomsfpac"    /> 
     488       <field field_ref="zotemind"   /> 
     489       <field field_ref="zosalind"     /> 
     490       <field field_ref="zosrfind"    /> 
     491       <field field_ref="zomsfind"    /> 
     492       <field field_ref="zotemipc"   /> 
     493       <field field_ref="zosalipc"     /> 
     494       <field field_ref="zosrfipc"    /> 
     495       <field field_ref="zomsfipc"     /> 
     496       <field field_ref="sophtadv"      /> 
     497       <field field_ref="sophtldf"      /> 
     498       <field field_ref="sopstadv"      /> 
     499       <field field_ref="sopstldf"      /> 
     500    </file> 
    474501 
    475502  <!-- 
  • CONFIG/UNIFORM/v6/IPSLCM6/GENERAL/POST/monitoring01_lim2_ORCA2.cfg

    r2297 r2690  
    3737#  field | files patterns | files additionnal | operations | title | units | calcul of area 
    3838#----------------------------------------------------------------------------------------------------------------- 
    39  iicethic_north  | "iicethic ice_pres"  | ORCA2.3_grid.nc | "(iicethic[d=1])" | "Ice thickness (NORTH)"      | "m" | "if lat[d=3] ge 0 and ice_pres[d=2] ne 0 then ice_pres[d=2]*mask[k=1,d=3]*area[d=3]" 
    40  iicethic_south  | "iicethic ice_pres"  | ORCA2.3_grid.nc | "(iicethic[d=1])" | "Ice thickness (SOUTH)"      | "m" | "if lat[d=3] le 0 and ice_pres[d=2] ne 0 then ice_pres[d=2]*mask[k=1,d=3]*area[d=3]" 
    41  isnowthi_north  | "isnowthi ice_pres"  | ORCA2.3_grid.nc | "(isnowthi[d=1])" | "Snow thickness (NORTH)"     | "m" | "if lat[d=3] ge 0 and ice_pres[d=2] ne 0 then ice_pres[d=2]*mask[k=1,d=3]*area[d=3]" 
    42  isnowthi_south  | "isnowthi ice_pres"  | ORCA2.3_grid.nc | "(isnowthi[d=1])" | "Snow thickness (SOUTH)"     | "m" | "if lat[d=3] le 0 and ice_pres[d=2] ne 0 then ice_pres[d=2]*mask[k=1,d=3]*area[d=3]" 
    43  icesurf_north   | "ice_pres"           | ORCA2.3_grid.nc | "(if lat[d=2] gt 0 then ice_pres[d=1]*area[d=2]*mask[k=1,d=2])"               | "Ice surface (NORTH)"  | "m2" | "2" 
    44  icesurf_south   | "ice_pres"           | ORCA2.3_grid.nc | "(if lat[d=2] lt 0 then ice_pres[d=1]*area[d=2]*mask[k=1,d=2])"               | "Ice surface (SOUTH)"  | "m2" | "2" 
    45  icevol_north    | "ice_pres iicethic"  | ORCA2.3_grid.nc | "(if lat[d=3] gt 0 then ice_pres[d=1]*iicethic[d=2]*area[d=3]*mask[k=1,d=3])" | "Ice volume (NORTH)"   | "m3" | "2" 
    46  icevol_south    | "ice_pres iicethic"  | ORCA2.3_grid.nc | "(if lat[d=3] lt 0 then ice_pres[d=1]*iicethic[d=2]*area[d=3]*mask[k=1,d=3])" | "Ice volume (SOUTH)"   | "m3" | "2" 
    47  snowvol_north   | "ice_pres isnowthi"  | ORCA2.3_grid.nc | "(if lat[d=3] gt 0 then ice_pres[d=1]*isnowthi[d=2]*area[d=3]*mask[k=1,d=3])" | "Snow volume (NORTH)"  | "m3" | "2" 
    48  snowvol_south   | "ice_pres isnowthi"  | ORCA2.3_grid.nc | "(if lat[d=3] lt 0 then ice_pres[d=1]*isnowthi[d=2]*area[d=3]*mask[k=1,d=3])" | "Snow volume (SOUTH)"  | "m3" | "2" 
     39 siconc_north    | "siconc"         | ORCA2.3_grid.nc | "(siconc[d=1])"   | "Ice Fraction (NORTH)"            | "-"     | "if lat[d=2] ge 0 then mask[k=1,d=2]*area[d=2]" 
     40 siconc_south    | "siconc"         | ORCA2.3_grid.nc | "(siconc[d=1])"   | "Ice Fraction (SOUTH)"            | "-"     | "if lat[d=2] le 0 then mask[k=1,d=2]*area[d=2]" 
     41 icesurf_north   | "siconc"         | ORCA2.3_grid.nc | "(if lat[d=2] ge 0 then siconc[d=1]*mask[k=1,d=2]*area[d=2])"             | "Ice Surface (NORTH)"   | "m2"    | "2" 
     42 icesurf_south   | "siconc"         | ORCA2.3_grid.nc | "(if lat[d=2] le 0 then siconc[d=1]*mask[k=1,d=2]*area[d=2])"             | "Ice Surface (SOUTH)"   | "m2"    | "2" 
     43 icevol_north    | "sivolu siconc"  | ORCA2.3_grid.nc | "(if lat[d=3] ge 0 then sivolu[d=1]*siconc[d=2]*mask[k=1,d=3]*area[d=3])" | "Ice Volume (NORTH)"    | "m3"    | "2" 
     44 snowol_south    | "snvolu siconc"  | ORCA2.3_grid.nc | "(if lat[d=3] le 0 then sivolu[d=1]*siconc[d=2]*mask[k=1,d=3]*area[d=3])" | "Ice Volum  (SOUTH)"    | "m3"    | "2" 
     45 snowvol_north   | "snvolu siconc"  | ORCA2.3_grid.nc | "(if lat[d=3] ge 0 then snvolu[d=1]*siconc[d=2]*mask[k=1,d=3]*area[d=3])" | "Snow Volume (NORTH)"   | "m3"    | "2" 
     46 icevol_south    | "sivolu siconc"  | ORCA2.3_grid.nc | "(if lat[d=3] le 0 then snvolu[d=1]*siconc[d=2]*mask[k=1,d=3]*area[d=3])" | "Snow Volume (SOUTH)"   | "m3"    | "2" 
     47 iicethic_north  | "sithic siconc"  | ORCA2.3_grid.nc | "(sithic[d=1])"   | "Ice thickness (NORTH)"           | "m"     | "if lat[d=3] ge 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     48 iicethic_south  | "sithic siconc"  | ORCA2.3_grid.nc | "(sithic[d=1])"   | "Ice thickness (SOUTH)"           | "m"     | "if lat[d=3] le 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     49 isnowthi_north  | "snvolu siconc"  | ORCA2.3_grid.nc | "(snvolu[d=1])"   | "Snow thickness (NORTH)"          | "m"     | "if lat[d=3] ge 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     50 isnowthi_south  | "snvolu siconc"  | ORCA2.3_grid.nc | "(snvolu[d=1])"   | "Snow thickness (SOUTH)"          | "m"     | "if lat[d=3] le 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     51 sisali_north    | "sisali siconc " | ORCA2.3_grid.nc | "(sisali[d=1])"   | "Ice Salinity (NORTH)"            | "PSS"   | "if lat[d=3] ge 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     52 sisali_south    | "sisali siconc " | ORCA2.3_grid.nc | "(sisali[d=1])"   | "Ice Salinity (NORTH)"            | "PSS"   | "if lat[d=3] le 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     53 sitemp_north    | "sitemp siconc " | ORCA2.3_grid.nc | "(sitemp[d=1])"   | "Ice Temperature (NORTH)"         | "C"     | "if lat[d=3] ge 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     54 sitemp_south    | "sitemp siconc " | ORCA2.3_grid.nc | "(sitemp[d=1])"   | "Ice Temperature (SOUTH)"         | "C"     | "if lat[d=3] le 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     55 sistem_north    | "sistem siconc " | ORCA2.3_grid.nc | "(sistem[d=1])"   | "Ice Surface Temperature (NORTH)" | "C"     | "if lat[d=3] ge 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     56 sistem_south    | "sistem siconc " | ORCA2.3_grid.nc | "(sistem[d=1])"   | "Ice Surface Temperature (SOUTH)" | "C"     | "if lat[d=3] le 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     57 siages_north    | "siages siconc " | ORCA2.3_grid.nc | "(siages[d=1])"   | "Ice Age (NORTH)"                 | "years" | "if lat[d=3] ge 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     58 siages_south    | "siages siconc " | ORCA2.3_grid.nc | "(siages[d=1])"   | "Ice Age (SOUTH)"                 | "years" | "if lat[d=3] le 0 then siconc[d=2]*mask[k=1,d=3]*area[d=3]" 
     59 
     60 
    4961#----------------------------------------------------------------------------------------------------------------- 
    5062 
Note: See TracChangeset for help on using the changeset viewer.