New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 6140 for trunk/NEMOGCM/CONFIG/AMM12 – NEMO

Ignore:
Timestamp:
2015-12-21T12:35:23+01:00 (8 years ago)
Author:
timgraham
Message:

Merge of branches/2015/dev_merge_2015 back into trunk. Merge excludes NEMOGCM/TOOLS/OBSTOOLS/ for now due to issues with the change of file type. Will sort these manually with further commits.

Branch merged as follows:
In the working copy of branch ran:
svn merge ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
Small conflicts due to bug fixes applied to trunk since the dev_merge_2015 was copied. Bug fixes were applied to the branch as well so these were easy to resolve.
Branch committed at this stage

In working copy run:
svn switch ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate ​svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2015/dev_merge_2015
to merge the branch into the trunk and then commit - no conflicts at this stage.

Location:
trunk/NEMOGCM/CONFIG/AMM12
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml

    r5385 r6140  
    2525      <file_group id="1ts" output_freq="1ts"  output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 
    2626 
    27       <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> <!-- 1h files --> 
     27<!--old      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."/> old --> <!-- 1h files -->  
     28   <!-- TMB files --> 
     29      <file_group id="1h" output_freq="1h"  output_level="10" enabled=".TRUE."  >                       
     30 
     31   <file id="file9" name_suffix="_shelftmb_grid_T" description="ocean T grid variables" enabled=".TRUE." > 
     32     <field field_ref="top_temp"           name="votemper_top"   operation="instant" enabled=".TRUE." /> 
     33     <field field_ref="mid_temp"           name="votemper_mid"   operation="instant" enabled=".TRUE." /> 
     34     <field field_ref="bot_temp"           name="votemper_bot"   operation="instant" enabled=".TRUE." /> 
     35     <field field_ref="sshnmasked"         name="sossheig"       operation="instant" enabled=".TRUE." />  
     36     <field field_ref="top_sal"            name="vosaline_top"   operation="instant" enabled=".TRUE." /> 
     37     <field field_ref="mid_sal"            name="vosaline_mid"   operation="instant" enabled=".TRUE." /> 
     38     <field field_ref="bot_sal"            name="vosaline_bot"   operation="instant" enabled=".TRUE." /> 
     39   </file> 
     40 
     41   <file id="file10" name_suffix="_shelftmb_grid_U" description="TMB ocean U grid variables" enabled=".TRUE." > 
     42     <field field_ref="top_u"         name="vozocrtx_top"   operation="instant" /> 
     43     <field field_ref="mid_u"         name="vozocrtx_mid"   operation="instant" /> 
     44     <field field_ref="bot_u"         name="vozocrtx_bot"   operation="instant" /> 
     45     <field field_ref="baro_u"        name="vobtcrtx"       operation="instant" /> 
     46   </file> 
     47 
     48   <file id="file11" name_suffix="_shelftmb_grid_V" description="TMB ocean V grid variables" enabled=".TRUE." > 
     49     <field field_ref="top_v"         name="vomecrty_top"   operation="instant" /> 
     50     <field field_ref="mid_v"         name="vomecrty_mid"   operation="instant" /> 
     51     <field field_ref="bot_v"         name="vomecrty_bot"   operation="instant" /> 
     52     <field field_ref="baro_v"        name="vobtcrty"       operation="instant" /> 
     53   </file> 
     54 
     55      </file_group> 
     56 
    2857      <file_group id="2h" output_freq="2h"  output_level="10" enabled=".TRUE."/> <!-- 2h files --> 
    2958      <file_group id="3h" output_freq="3h"  output_level="10" enabled=".TRUE."/> <!-- 3h files -->      
    3059      <file_group id="4h" output_freq="4h"  output_level="10" enabled=".TRUE."/> <!-- 4h files --> 
    3160      <file_group id="6h" output_freq="6h"  output_level="10" enabled=".TRUE."/> <!-- 6h files --> 
     61 
     62      <file_group id="25h_mean" output_freq="1d" output_level="10" enabled=".TRUE."> 
     63 
     64 
     65     <file id="file12" name_suffix="_25hourm_grid_T" description="ocean T grid variables, 25h meaned" enabled=".TRUE." > 
     66     <field field_ref="temper25h"   name="votemper"  operation="instant" enabled=".TRUE."/> 
     67     <field field_ref="tempis25h"   name="votempis"  operation="instant" enabled=".TRUE."/> 
     68     <field field_ref="salin25h"    name="vosaline"  operation="instant" enabled=".TRUE."/> 
     69     <field field_ref="ssh25h"      name="sossheig"  operation="instant" enabled=".TRUE."/> 
     70    </file> 
     71 
     72     <file id="file13" name_suffix="_25hourm_grid_U" description="ocean U grid variables, 25h meaned" enabled=".TRUE." > 
     73     <field field_ref="vozocrtx25h" name="vozocrtx"  operation="instant" enabled=".TRUE."/> 
     74    </file> 
     75 
     76     <file id="file14" name_suffix="_25hourm_grid_V" description="ocean V grid variables, 25h meaned" enabled=".TRUE." > 
     77     <field field_ref="vomecrty25h" name="vomecrty"  operation="instant" enabled=".TRUE."/> 
     78    </file> 
     79 
     80     <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." > 
     81     <field field_ref="vomecrtz25h"          name="vomerctz"  operation="instant" enabled=".TRUE."/> 
     82     <field field_ref="woce"                 name="vovecrtz"  operation="instant" enabled=".TRUE."/> 
     83     <field field_ref="avt25h"               name="votkeavt"  operation="instant" enabled=".TRUE."/> 
     84     <field field_ref="avm25h"               name="votkeavm"  operation="instant" enabled=".TRUE."/> 
     85     <field field_ref="tke25h"               name="votke"  operation="instant" enabled=".TRUE."/> 
     86     <field field_ref="mxln25h"              name="mxln"   operation="instant" enabled=".TRUE."/> 
     87    </file> 
     88      </file_group> 
    3289      
    3390      <file_group id="1d" output_freq="1d"  output_level="10" enabled=".TRUE."> <!-- 1d files --> 
    … …  
    98155      <file_group id="5y"  output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files --> 
    99156      <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files --> 
     157 
    100158 
    101159   </file_definition> 

  • trunk/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg

    r5930 r6140  
    3434&namzgr        !   vertical coordinate 
    3535!----------------------------------------------------------------------- 
    36    ln_zps      = .false.   !  z-coordinate - partial steps   (T/F) 
    37    ln_sco      = .true.    !  s- or hybrid z-s-coordinate    (T/F) 
     36   ln_sco      = .true.    !  s- or hybrid z-s-coordinate 
    3837/ 
    3938!----------------------------------------------------------------------- 
    … …  
    5049!----------------------------------------------------------------------- 
    5150   rn_rdt      =   600.    !  time step for the dynamics (and tracer if nn_acc=0) 
    52    rn_rdtmin   =   600.          !  minimum time step on tracers (used if nn_acc=1) 
    53    rn_rdtmax   =   600.          !  maximum time step on tracers (used if nn_acc=1) 
    54    rn_rdth     =   600.          !  depth variation of tracer time step  (used if nn_acc=1) 
    5551   ppglam0     =  999999.0             !  longitude of first raw and column T-point (jphgr_msh = 1) 
    5652   ppgphi0     =  999999.0             ! latitude  of first raw and column T-point (jphgr_msh = 1) 
    … …  
    9389   nn_fwb      = 0         !  FreshWater Budget: =0 unchecked 
    9490   ln_apr_dyn  = .false.    !  Patm gradient added in ocean & ice Eqs.   (T => fill namsbc_apr ) 
     91   ln_traqsr   = .false.   !  Light penetration (T) or not (F) 
    9592 
    9693/ 
    … …  
    130127&namtra_qsr    !   penetrative solar radiation 
    131128!----------------------------------------------------------------------- 
    132    ln_traqsr   = .false.   !  Light penetration (T) or not (F) 
    133129   nn_chldta   =      0    !  RGB : Chl data (=1) or cst value (=0) 
    134130/ 
    … …  
    250246/ 
    251247!----------------------------------------------------------------------- 
    252 &nambbc        !   bottom temperature boundary condition 
    253 !----------------------------------------------------------------------- 
    254    ln_trabbc   = .false.   !  Apply a geothermal heating at the ocean bottom 
     248&nambbc        !   bottom temperature boundary condition                (default: NO) 
     249!----------------------------------------------------------------------- 
    255250/ 
    256251!----------------------------------------------------------------------- 
    … …  
    339334&namdyn_spg    !   surface pressure gradient  
    340335!----------------------------------------------------------------------- 
    341    ln_dynspg_ts   = .true.    ! split-explicit free surface 
    342       ln_bt_auto    = .false.   ! Number of sub-step defined from: 
    343          nn_baro      = 30        ! =F : the number of sub-step in rn_rdt seconds 
     336   ln_dynspg_ts = .true.    ! split-explicit free surface 
     337      ln_bt_auto    = .false.  ! Number of sub-step defined from: 
     338         nn_baro       = 30       ! =F : the number of sub-step in rn_rdt seconds 
    344339/ 
    345340!----------------------------------------------------------------------- 
    … …  
    449444/ 
    450445!----------------------------------------------------------------------- 
    451 &namdyn_nept  !   Neptune effect (simplified: lateral and vertical diffusions removed) 
    452 !----------------------------------------------------------------------- 
    453 / 
     446&nam_diatmb  !  Top Middle Bottom Output 
     447!----------------------------------------------------------------------- 
     448   ln_diatmb  = .true.    !  Choose Top Middle and Bottom output or not 
     449/ 
     450!----------------------------------------------------------------------- 
     451&nam_dia25h  !  25h Mean Output 
     452!----------------------------------------------------------------------- 
     453   ln_dia25h  = .true.    ! Choose 25h mean output or not 
     454/ 
     455 

  • trunk/NEMOGCM/CONFIG/AMM12/cpp_AMM12.fcm

    r5930 r6140  
    1  bld::tool::fppkeys  key_bdy key_tide  key_zdfgls  key_vvl key_diainstant key_mpp_mpi key_iomput 
     1 bld::tool::fppkeys  key_bdy key_tide key_zdfgls key_diainstant key_mpp_mpi key_iomput 
Note: See TracChangeset for help on using the changeset viewer.