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 12377 for NEMO/trunk/cfgs/AMM12 – NEMO

Ignore:
Timestamp:
2020-02-12T15:39:06+01:00 (4 years ago)
Author:
acc
Message:

The big one. Merging all 2019 developments from the option 1 branch back onto the trunk.

This changeset reproduces 2019/dev_r11943_MERGE_2019 on the trunk using a 2-URL merge
onto a working copy of the trunk. I.e.:

svn merge --ignore-ancestry \

​svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/trunk \
​svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/NEMO/branches/2019/dev_r11943_MERGE_2019 ./

The --ignore-ancestry flag avoids problems that may otherwise arise from the fact that
the merge history been trunk and branch may have been applied in a different order but
care has been taken before this step to ensure that all applicable fixes and updates
are present in the merge branch.

The trunk state just before this step has been branched to releases/release-4.0-HEAD
and that branch has been immediately tagged as releases/release-4.0.2. Any fixes
or additions in response to tickets on 4.0, 4.0.1 or 4.0.2 should be done on
releases/release-4.0-HEAD. From now on future 'point' releases (e.g. 4.0.2) will
remain unchanged with periodic releases as needs demand. Note release-4.0-HEAD is a
transitional naming convention. Future full releases, say 4.2, will have a release-4.2
branch which fulfills this role and the first point release (e.g. 4.2.0) will be made
immediately following the release branch creation.

2020 developments can be started from any trunk revision later than this one.

Location:
NEMO/trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • NEMO/trunk

    • Property svn:externals

      •  

        old new  
        33^/utils/build/mk@HEAD         mk 
        44^/utils/tools@HEAD            tools 
        5 ^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
         5^/vendors/AGRIF/dev_r11615_ENHANCE-04_namelists_as_internalfiles_agrif@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
        77^/vendors/IOIPSL@HEAD         ext/IOIPSL 

  • NEMO/trunk/cfgs/AMM12/EXPREF/context_nemo.xml

    r12276 r12377  
    1616       <variable id="rhoic"     type="float" > 917.0 </variable> 
    1717       <variable id="rhosn"     type="float" > 330.0 </variable> 
    18        <variable id="missval"   type="float" > 1.e20 </variable> 
     18       <variable id="missval"  type="float" > 1.e20 </variable>           
    1919    </variable_definition> 
    2020 
    2121<!-- Fields definition --> 
    22     <field_definition src="./field_def_nemo-oce.xml"/>      <!--  NEMO ocean dynamics                     --> 
     22    <field_definition src="./field_def_nemo-oce.xml"/>   <!--  NEMO ocean dynamics                     --> 
     23 
     24<!-- Override field definitions for multiple-linear-regression analysis (diamlr) --> 
     25    <field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > 
     26      <field_group id="diamlr_fields"> 
     27        <!-- Time --> 
     28        <field id="diamlr_time" grid_ref="diamlr_grid_T_2D" prec="8" /> 
     29        <!-- Regressors for tidal harmonic analysis --> 
     30        <field id="diamlr_r001" field_ref="diamlr_time" expr="sin( __TDE_M2_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:M2" /> 
     31        <field id="diamlr_r002" field_ref="diamlr_time" expr="cos( __TDE_M2_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:M2" /> 
     32        <field id="diamlr_r003" field_ref="diamlr_time" expr="sin( __TDE_K1_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:K1" /> 
     33        <field id="diamlr_r004" field_ref="diamlr_time" expr="cos( __TDE_K1_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:K1" /> 
     34        <field id="diamlr_r005" enabled=".FALSE." /> 
     35        <field id="diamlr_r006" enabled=".FALSE." /> 
     36        <field id="diamlr_r007" enabled=".FALSE." /> 
     37        <field id="diamlr_r008" enabled=".FALSE." /> 
     38        <field id="diamlr_r009" enabled=".FALSE." /> 
     39        <field id="diamlr_r010" enabled=".FALSE." /> 
     40        <field id="diamlr_r011" enabled=".FALSE." /> 
     41        <field id="diamlr_r012" enabled=".FALSE." /> 
     42        <field id="diamlr_r013" enabled=".FALSE." /> 
     43        <field id="diamlr_r014" enabled=".FALSE." /> 
     44        <field id="diamlr_r015" enabled=".FALSE." /> 
     45        <field id="diamlr_r016" enabled=".FALSE." /> 
     46        <field id="diamlr_r017" enabled=".FALSE." /> 
     47        <field id="diamlr_r018" enabled=".FALSE." /> 
     48        <field id="diamlr_r019" enabled=".FALSE." /> 
     49        <field id="diamlr_r020" enabled=".FALSE." /> 
     50        <field id="diamlr_r021" enabled=".FALSE." /> 
     51        <field id="diamlr_r022" enabled=".FALSE." /> 
     52        <field id="diamlr_r023" enabled=".FALSE." /> 
     53        <field id="diamlr_r024" enabled=".FALSE." /> 
     54        <field id="diamlr_r025" enabled=".FALSE." /> 
     55        <field id="diamlr_r026" enabled=".FALSE." /> 
     56        <field id="diamlr_r027" enabled=".FALSE." /> 
     57        <field id="diamlr_r028" enabled=".FALSE." /> 
     58        <field id="diamlr_r029" enabled=".FALSE." /> 
     59        <field id="diamlr_r030" enabled=".FALSE." /> 
     60        <field id="diamlr_r031" enabled=".FALSE." /> 
     61        <field id="diamlr_r032" enabled=".FALSE." /> 
     62        <field id="diamlr_r033" enabled=".FALSE." /> 
     63        <field id="diamlr_r034" enabled=".FALSE." /> 
     64        <field id="diamlr_r035" enabled=".FALSE." /> 
     65        <field id="diamlr_r036" enabled=".FALSE." /> 
     66        <field id="diamlr_r037" enabled=".FALSE." /> 
     67        <field id="diamlr_r038" enabled=".FALSE." /> 
     68        <field id="diamlr_r101" field_ref="diamlr_time" expr="diamlr_time^0.0"                       enabled=".TRUE."  comment="mean"            /> 
     69        <!-- Fields selected for regression analysis --> 
     70        <field id="diamlr_f001" field_ref="ssh"  enabled=".TRUE." /> 
     71        <field id="diamlr_f002" field_ref="uoce" enabled=".TRUE." /> 
     72        <field id="diamlr_f003" field_ref="voce" enabled=".TRUE." /> 
     73        <field id="diamlr_f004" field_ref="toce" enabled=".TRUE." /> 
     74      </field_group> 
     75    </field_definition> 
    2376 
    2477<!-- Files definition --> 
    2578    <file_definition src="./file_def_nemo-oce.xml"/>     <!--  NEMO ocean dynamics                     --> 
    2679 
     80    <file_definition type="multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4"> 
     81 
     82<!-- Activation of intermediate output for multiple-linear-regression analysis (diamlr) --> 
     83      <file_group id="diamlr_files" output_freq="1d"  output_level="10" enabled=".TRUE."/> 
     84 
     85<!-- Activation and selection of daily detided model diagnostics (diadetide) --> 
     86      <file_group id="diadetide_files" output_freq="1d" output_level="10" enabled=".TRUE."> 
     87   <file id="file22" name_suffix="_M2detided_grid_T" description="M2-detided ocean T-grid variables"> 
     88     <field id="diadetide_ssh"  field_ref="diadetide_weight_grid_T_2D" operation="accumulate"> this * ssh </field> 
     89   </file> 
     90   <file id="file23" name_suffix="_M2detided_grid_U" description="M2-detided ocean U-grid variables"> 
     91     <field id="diadetide_uoce" field_ref="diadetide_weight_grid_U_3D" operation="accumulate"> this * uoce </field> 
     92   </file> 
     93   <file id="file24" name_suffix="_M2detided_grid_V" description="M2-detided ocean V-grid variables"> 
     94     <field id="diadetide_voce"  field_ref="diadetide_weight_grid_V_3D" operation="accumulate"> this * voce </field> 
     95   </file> 
     96      </field_group> 
     97 
     98    </file_definition> 
     99 
    27100<!-- Axis definition --> 
    28101    <axis_definition src="./axis_def_nemo.xml"/> 
    29   
     102 
    30103<!-- Domain definition --> 
    31104    <domain_definition src="./domain_def_nemo.xml"/> 

  • NEMO/trunk/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml

    r12230 r12377  
    4242 
    4343      <file_group id="25h_mean" output_freq="1d" output_level="10" enabled=".TRUE."> 
    44  
    4544 
    4645     <file id="file12" name_suffix="_25hourm_grid_T" description="ocean T grid variables, 25h meaned" enabled=".TRUE." > 

  • NEMO/trunk/cfgs/AMM12/EXPREF/namelist_cfg

    r12206 r12377  
    154154&nam_tide      !   tide parameters                                      (default: OFF) 
    155155!----------------------------------------------------------------------- 
    156    ln_tide     = .true.    ! Activate tides 
    157       ln_tide_pot   = .true.  !  use tidal potential forcing 
    158  
    159    clname(1)     =   'Q1'   !  name of constituent 
    160    clname(2)     =   'O1' 
    161    clname(3)     =   'P1' 
    162    clname(4)     =   'S1' 
    163    clname(5)     =   'K1' 
    164    clname(6)     =   '2N2' 
    165    clname(7)     =   'MU2' 
    166    clname(8)     =   'N2' 
    167    clname(9)     =   'NU2' 
    168    clname(10)    =   'M2' 
    169    clname(11)    =   'L2' 
    170    clname(12)    =   'T2' 
    171    clname(13)    =   'S2' 
    172    clname(14)    =   'K2' 
    173    clname(15)    =   'M4' 
     156   ln_tide     = .true.        ! Activate tides 
     157      ln_tide_pot     = .true. !  use tidal potential forcing 
     158   sn_tide_cnames(1)  = 'Q1'   !  name of constituent 
     159   sn_tide_cnames(2)  = 'O1' 
     160   sn_tide_cnames(3)  = 'P1' 
     161   sn_tide_cnames(4)  = 'S1' 
     162   sn_tide_cnames(5)  = 'K1' 
     163   sn_tide_cnames(6)  = '2N2' 
     164   sn_tide_cnames(7)  = 'MU2' 
     165   sn_tide_cnames(8)  = 'N2' 
     166   sn_tide_cnames(9)  = 'NU2' 
     167   sn_tide_cnames(10) = 'M2' 
     168   sn_tide_cnames(11) = 'L2' 
     169   sn_tide_cnames(12) = 'T2' 
     170   sn_tide_cnames(13) = 'S2' 
     171   sn_tide_cnames(14) = 'K2' 
     172   sn_tide_cnames(15) = 'M4' 
    174173/ 
    175174!----------------------------------------------------------------------- 
    … …  
    351350!!   namdiu       Cool skin and warm layer models                       (default: OFF) 
    352351!!   namflo       float parameters                                      (default: OFF) 
    353 !!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF) 
    354352!!   nam_diadct   transports through some sections                      (default: OFF) 
    355353!!   nam_dia25h   25h Mean Output                                       (default: OFF) 
Note: See TracChangeset for help on using the changeset viewer.