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 12184 for NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED – NEMO

Ignore:
Timestamp:
2019-12-11T14:35:26+01:00 (5 years ago)
Author:
smueller
Message:

Merging of the developments in /NEMO/branches/2019/dev_r11879_ENHANCE-05_SimonM-Harmonic_Analysis@12122 with respect to /NEMO/trunk@12072 into /NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019 (tickets #2175 and #2194)

Location:
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019

    • Property svn:externals
      •  

        old new  
        22^/utils/build/makenemo@HEAD   makenemo 
        33^/utils/build/mk@HEAD         mk 
        4 ^/utils/tools@HEAD            tools 
         4^/utils/tools_dev_r11751_ENHANCE-05_SimonM-Harmonic_Analysis@HEAD tools 
        55^/vendors/AGRIF/dev@HEAD      ext/AGRIF 
        66^/vendors/FCM@HEAD            ext/FCM 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml

    r12172 r12184  
    11<?xml version="1.0"?>  
    22    <!-- $id$ --> 
     3 
     4    <field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined --> 
     5 
     6    <!-- 
     7       ===================================================================================================== 
     8       =                                   Configurable diagnostics                                        = 
     9       ===================================================================================================== 
     10      --> 
     11 
     12    <field_group id="diamlr_fields"> 
     13 
     14    <!-- 
     15       ===================================================================================================== 
     16                         Configuration of multiple-linear-regression analysis (diamlr) 
     17       ===================================================================================================== 
     18        
     19       This field group configures diamlr for tidal harmonic analysis of field 
     20       ssh: in addition to a regressor for fitting the mean value (diamlr_r101), 
     21       it includes the regressors for the analysis of the tidal constituents 
     22       that are available in the tidal-forcing implementation (see 
     23       ./src/OCE/SBC/tide.h90). 
     24 
     25      --> 
     26 
     27      <!-- Time --> 
     28      <field id="diamlr_time" grid_ref="diamlr_grid_T_2D" prec="8" /> 
     29 
     30      <!-- Regressors for tidal harmonic analysis --> 
     31      <field id="diamlr_r001"  field_ref="diamlr_time" expr="sin( __TDE_M2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:M2"   /> 
     32      <field id="diamlr_r002"  field_ref="diamlr_time" expr="cos( __TDE_M2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:M2"   /> 
     33      <field id="diamlr_r003"  field_ref="diamlr_time" expr="sin( __TDE_N2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:N2"   /> 
     34      <field id="diamlr_r004"  field_ref="diamlr_time" expr="cos( __TDE_N2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:N2"   /> 
     35      <field id="diamlr_r005"  field_ref="diamlr_time" expr="sin( __TDE_2N2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:2N2"  /> 
     36      <field id="diamlr_r006"  field_ref="diamlr_time" expr="cos( __TDE_2N2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:2N2"  /> 
     37      <field id="diamlr_r007"  field_ref="diamlr_time" expr="sin( __TDE_S2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:S2"   /> 
     38      <field id="diamlr_r008"  field_ref="diamlr_time" expr="cos( __TDE_S2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:S2"   /> 
     39      <field id="diamlr_r009"  field_ref="diamlr_time" expr="sin( __TDE_K2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:K2"   /> 
     40      <field id="diamlr_r010"  field_ref="diamlr_time" expr="cos( __TDE_K2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:K2"   /> 
     41      <field id="diamlr_r011"  field_ref="diamlr_time" expr="sin( __TDE_K1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:K1"   /> 
     42      <field id="diamlr_r012"  field_ref="diamlr_time" expr="cos( __TDE_K1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:K1"   /> 
     43      <field id="diamlr_r013"  field_ref="diamlr_time" expr="sin( __TDE_O1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:O1"   /> 
     44      <field id="diamlr_r014"  field_ref="diamlr_time" expr="cos( __TDE_O1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:O1"   /> 
     45      <field id="diamlr_r015"  field_ref="diamlr_time" expr="sin( __TDE_Q1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Q1"   /> 
     46      <field id="diamlr_r016"  field_ref="diamlr_time" expr="cos( __TDE_Q1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Q1"   /> 
     47      <field id="diamlr_r017"  field_ref="diamlr_time" expr="sin( __TDE_P1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:P1"   /> 
     48      <field id="diamlr_r018"  field_ref="diamlr_time" expr="cos( __TDE_P1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:P1"   /> 
     49      <field id="diamlr_r019"  field_ref="diamlr_time" expr="sin( __TDE_M4_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:M4"   /> 
     50      <field id="diamlr_r020"  field_ref="diamlr_time" expr="cos( __TDE_M4_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:M4"   /> 
     51      <field id="diamlr_r021"  field_ref="diamlr_time" expr="sin( __TDE_Mf_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Mf"   /> 
     52      <field id="diamlr_r022"  field_ref="diamlr_time" expr="cos( __TDE_Mf_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Mf"   /> 
     53      <field id="diamlr_r023"  field_ref="diamlr_time" expr="sin( __TDE_Mm_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Mm"   /> 
     54      <field id="diamlr_r024"  field_ref="diamlr_time" expr="cos( __TDE_Mm_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Mm"   /> 
     55      <field id="diamlr_r025"  field_ref="diamlr_time" expr="sin( __TDE_Msqm_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Msqm" /> 
     56      <field id="diamlr_r026"  field_ref="diamlr_time" expr="cos( __TDE_Msqm_omega__ * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Msqm" /> 
     57      <field id="diamlr_r027"  field_ref="diamlr_time" expr="sin( __TDE_Mtm_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:Mtm"  /> 
     58      <field id="diamlr_r028"  field_ref="diamlr_time" expr="cos( __TDE_Mtm_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:Mtm"  /> 
     59      <field id="diamlr_r029"  field_ref="diamlr_time" expr="sin( __TDE_S1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:S1"   /> 
     60      <field id="diamlr_r030"  field_ref="diamlr_time" expr="cos( __TDE_S1_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:S1"   /> 
     61      <field id="diamlr_r031"  field_ref="diamlr_time" expr="sin( __TDE_MU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:MU2"  /> 
     62      <field id="diamlr_r032"  field_ref="diamlr_time" expr="cos( __TDE_MU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:MU2"  /> 
     63      <field id="diamlr_r033"  field_ref="diamlr_time" expr="sin( __TDE_NU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:NU2"  /> 
     64      <field id="diamlr_r034"  field_ref="diamlr_time" expr="cos( __TDE_NU2_omega__  * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:NU2"  /> 
     65      <field id="diamlr_r035"  field_ref="diamlr_time" expr="sin( __TDE_L2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:L2"   /> 
     66      <field id="diamlr_r036"  field_ref="diamlr_time" expr="cos( __TDE_L2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:L2"   /> 
     67      <field id="diamlr_r037"  field_ref="diamlr_time" expr="sin( __TDE_T2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:sin:T2"   /> 
     68      <field id="diamlr_r038"  field_ref="diamlr_time" expr="cos( __TDE_T2_omega__   * diamlr_time )" enabled=".TRUE."  comment="harmonic:cos:T2"   /> 
     69      <field id="diamlr_r101"  field_ref="diamlr_time" expr="diamlr_time^0.0"                         enabled=".TRUE."  comment="mean"              /> 
     70 
     71      <!-- Fields selected for regression analysis --> 
     72      <field id="diamlr_f001" field_ref="ssh" enabled=".TRUE." /> 
     73 
     74    </field_group> 
    375     
    476    <!--  
     
    880============================================================================================================ 
    981    --> 
    10     <field_definition level="1" prec="4" operation="average" enabled=".TRUE." default_value="1.e20" > <!-- time step automaticaly defined --> 
     82 
     83    <field_group id="diadetide_fields"> 
     84 
     85    <!-- 
     86       ===================================================================================================== 
     87                 Weight fields for the computation of daily detided model diagnostics (diadetide) 
     88       ===================================================================================================== 
     89 
     90       --> 
     91 
     92      <field id="diadetide_weight" grid_ref="diadetide_grid_T_2D" enabled=".TRUE." /> 
     93      <field id="diadetide_weight_grid_T_2D" field_ref="diadetide_weight" grid_ref="diadetide_grid_T_2D" enabled=".TRUE." > this </field> 
     94      <field id="diadetide_weight_grid_U_2D" field_ref="diadetide_weight" grid_ref="diadetide_grid_U_2D" enabled=".TRUE." > this </field> 
     95      <field id="diadetide_weight_grid_V_2D" field_ref="diadetide_weight" grid_ref="diadetide_grid_V_2D" enabled=".TRUE." > this </field> 
     96      <field id="diadetide_weight_grid_T_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_T_3D" enabled=".TRUE." > this </field> 
     97      <field id="diadetide_weight_grid_U_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_U_3D" enabled=".TRUE." > this </field> 
     98      <field id="diadetide_weight_grid_V_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_V_3D" enabled=".TRUE." > this </field> 
     99      <field id="diadetide_weight_grid_W_3D" field_ref="diadetide_weight" grid_ref="diadetide_grid_2D_to_grid_W_3D" enabled=".TRUE." > this </field> 
     100 
     101    </field_group> 
    11102 
    12103    <!--  
     
    138229 
    139230      <field_group id="Tides_T" grid_ref="grid_T_2D" operation="once" > 
    140         <!-- tidal composante --> 
    141         <field id="M2x"          long_name="M2 Elevation harmonic real part "                             unit="m"        /> 
    142         <field id="M2y"          long_name="M2 Elevation harmonic imaginary part"                         unit="m"        /> 
    143         <field id="S2x"          long_name="S2 Elevation harmonic real part "                             unit="m"        /> 
    144         <field id="S2y"          long_name="S2 Elevation harmonic imaginary part"                         unit="m"        /> 
    145         <field id="N2x"          long_name="N2 Elevation harmonic real part "                             unit="m"        /> 
    146         <field id="N2y"          long_name="N2 Elevation harmonic imaginary part"                         unit="m"        /> 
    147         <field id="K1x"          long_name="K1 Elevation harmonic real part "                             unit="m"        /> 
    148         <field id="K1y"          long_name="K1 Elevation harmonic imaginary part"                         unit="m"        /> 
    149         <field id="O1x"          long_name="O1 Elevation harmonic real part "                             unit="m"        /> 
    150         <field id="O1y"          long_name="O1 Elevation harmonic imaginary part"                         unit="m"        /> 
    151         <field id="Q1x"          long_name="Q1 Elevation harmonic real part "                             unit="m"        /> 
    152         <field id="Q1y"          long_name="Q1 Elevation harmonic imaginary part"                         unit="m"        /> 
    153         <field id="M4x"          long_name="M4 Elevation harmonic real part "                             unit="m"        /> 
    154         <field id="M4y"          long_name="M4 Elevation harmonic imaginary part"                         unit="m"        /> 
    155         <field id="K2x"          long_name="K2 Elevation harmonic real part "                             unit="m"        /> 
    156         <field id="K2y"          long_name="K2 Elevation harmonic imaginary part"                         unit="m"        /> 
    157         <field id="P1x"          long_name="P1 Elevation harmonic real part "                             unit="m"        /> 
    158         <field id="P1y"          long_name="P1 Elevation harmonic imaginary part"                         unit="m"        /> 
    159         <field id="Mfx"          long_name="Mf Elevation harmonic real part "                             unit="m"        /> 
    160         <field id="Mfy"          long_name="Mf Elevation harmonic imaginary part"                         unit="m"        /> 
    161         <field id="Mmx"          long_name="Mm Elevation harmonic real part "                             unit="m"        /> 
    162         <field id="Mmy"          long_name="Mm Elevation harmonic imaginary part"                         unit="m"        /> 
    163       </field_group> 
    164      
    165       <field_group id="Tides_U" grid_ref="grid_U_2D" operation="once" > 
    166         <field id="M2x_u"        long_name="M2 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    167         <field id="M2y_u"        long_name="M2 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    168         <field id="S2x_u"        long_name="S2 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    169         <field id="S2y_u"        long_name="S2 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    170         <field id="N2x_u"        long_name="N2 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    171         <field id="N2y_u"        long_name="N2 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    172         <field id="K1x_u"        long_name="K1 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    173         <field id="K1y_u"        long_name="K1 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    174         <field id="O1x_u"        long_name="O1 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    175         <field id="O1y_u"        long_name="O1 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    176         <field id="Q1x_u"        long_name="Q1 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    177         <field id="Q1y_u"        long_name="Q1 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    178         <field id="M4x_u"        long_name="M4 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    179         <field id="M4y_u"        long_name="M4 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    180         <field id="K2x_u"        long_name="K2 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    181         <field id="K2y_u"        long_name="K2 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    182         <field id="P1x_u"        long_name="P1 current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    183         <field id="P1y_u"        long_name="P1 current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    184         <field id="Mfx_u"        long_name="Mf current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    185         <field id="Mfy_u"        long_name="Mf current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    186         <field id="Mmx_u"        long_name="Mm current barotrope along i-axis harmonic real part "        unit="m/s"      /> 
    187         <field id="Mmy_u"        long_name="Mm current barotrope along i-axis harmonic imaginary part "   unit="m/s"      /> 
    188       </field_group> 
    189      
    190       <field_group id="Tides_V" grid_ref="grid_V_2D" operation="once" > 
    191         <field id="M2x_v"        long_name="M2 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    192         <field id="M2y_v"        long_name="M2 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    193         <field id="S2x_v"        long_name="S2 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    194         <field id="S2y_v"        long_name="S2 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    195         <field id="N2x_v"        long_name="N2 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    196         <field id="N2y_v"        long_name="N2 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    197         <field id="K1x_v"        long_name="K1 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    198         <field id="K1y_v"        long_name="K1 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    199         <field id="O1x_v"        long_name="O1 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    200         <field id="O1y_v"        long_name="O1 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    201         <field id="Q1x_v"        long_name="Q1 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    202         <field id="Q1y_v"        long_name="Q1 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    203         <field id="M4x_v"        long_name="M4 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    204         <field id="M4y_v"        long_name="M4 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    205         <field id="K2x_v"        long_name="K2 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    206         <field id="K2y_v"        long_name="K2 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    207         <field id="P1x_v"        long_name="P1 current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    208         <field id="P1y_v"        long_name="P1 current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    209         <field id="Mfx_v"        long_name="Mf current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    210         <field id="Mfy_v"        long_name="Mf current barotrope along j-axis harmonic imaginary part "   unit="m/s"      /> 
    211         <field id="Mmx_v"        long_name="Mm current barotrope along j-axis harmonic real part "        unit="m/s"      /> 
    212         <field id="Mmy_v"        long_name="Mm current barotrope along j-axis harmonic imaginary part "   unit="m/s"      />    
     231        <!-- Tidal potential --> 
     232        <field id="tide_pot"      long_name="Total tidal potential" unit="m" /> 
     233        <field id="tide_pot_M2"   long_name="M2 tidal potential"    unit="m" /> 
     234        <field id="tide_pot_N2"   long_name="N2 tidal potential"    unit="m" /> 
     235        <field id="tide_pot_2N2"  long_name="2N2 tidal potential"   unit="m" /> 
     236        <field id="tide_pot_S2"   long_name="S2 tidal potential"    unit="m" /> 
     237        <field id="tide_pot_K2"   long_name="K2 tidal potential"    unit="m" /> 
     238        <field id="tide_pot_K1"   long_name="K1 tidal potential"    unit="m" /> 
     239        <field id="tide_pot_O1"   long_name="O1 tidal potential"    unit="m" /> 
     240        <field id="tide_pot_Q1"   long_name="Q1 tidal potential"    unit="m" /> 
     241        <field id="tide_pot_P1"   long_name="P1 tidal potential"    unit="m" /> 
     242        <field id="tide_pot_M4"   long_name="M4 tidal potential"    unit="m" /> 
     243        <field id="tide_pot_Mf"   long_name="Mf tidal potential"    unit="m" /> 
     244        <field id="tide_pot_Mm"   long_name="Mm tidal potential"    unit="m" /> 
     245        <field id="tide_pot_Msqm" long_name="Msqm tidal potential"  unit="m" /> 
     246        <field id="tide_pot_Mtm"  long_name="Mtm tidal potential"   unit="m" /> 
     247        <field id="tide_pot_S1"   long_name="S1 tidal potential"    unit="m" /> 
     248        <field id="tide_pot_MU2"  long_name="MU2 tidal potential"   unit="m" /> 
     249        <field id="tide_pot_NU2"  long_name="NU2 tidal potential"   unit="m" /> 
     250        <field id="tide_pot_L2"   long_name="L2 tidal potential"    unit="m" /> 
     251        <field id="tide_pot_T2"   long_name="T2 tidal potential"    unit="m" /> 
    213252      </field_group> 
    214253 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml

    r12109 r12184  
     1<?xml version="1.0"?> 
    12<!-- 
    23============================================================================================================ 
     
    45============================================================================================================ 
    56    --> 
    6   
     7 
    78    <grid_definition>     
    89 
     
    240241        <scalar/> 
    241242      </grid> 
    242   
    243     </grid_definition>    
    244   
     243 
     244      <!-- grid definitions for multiple-linear-regression analysis (diamlr) --> 
     245      <grid id="diamlr_grid_scalar" > 
     246   <scalar /> 
     247   <scalar /> 
     248      </grid> 
     249      <grid id="diamlr_grid_T_2D" > 
     250   <domain domain_ref="grid_T" /> 
     251   <scalar /> 
     252      </grid> 
     253      <grid id="diamlr_grid_U_2D" > 
     254   <domain domain_ref="grid_U" /> 
     255   <scalar /> 
     256      </grid> 
     257      <grid id="diamlr_grid_V_2D" > 
     258   <domain domain_ref="grid_V" /> 
     259   <scalar /> 
     260      </grid> 
     261      <grid id="diamlr_grid_W_2D" > 
     262   <domain domain_ref="grid_W" /> 
     263   <scalar /> 
     264      </grid> 
     265      <grid id="diamlr_grid_2D_to_grid_T_3D" > 
     266   <domain domain_ref="grid_T" /> 
     267        <axis axis_ref="deptht"> 
     268          <duplicate_scalar /> 
     269        </axis> 
     270      </grid> 
     271      <grid id="diamlr_grid_2D_to_grid_U_3D" > 
     272   <domain domain_ref="grid_U" /> 
     273        <axis axis_ref="depthu"> 
     274          <duplicate_scalar /> 
     275        </axis> 
     276      </grid> 
     277      <grid id="diamlr_grid_2D_to_grid_V_3D" > 
     278   <domain domain_ref="grid_V" /> 
     279        <axis axis_ref="depthv"> 
     280          <duplicate_scalar /> 
     281        </axis> 
     282      </grid> 
     283      <grid id="diamlr_grid_2D_to_grid_W_3D" > 
     284   <domain domain_ref="grid_W" /> 
     285        <axis axis_ref="depthw"> 
     286          <duplicate_scalar /> 
     287        </axis> 
     288      </grid> 
     289      <grid id="diamlr_grid_2D_to_scalar" > 
     290        <scalar> 
     291          <reduce_domain operation="average" /> 
     292        </scalar> 
     293   <scalar /> 
     294      </grid> 
     295      <!-- grid definitions for the computation of daily detided model diagnostics (diadetide) --> 
     296      <grid id="diadetide_grid_T_2D" > 
     297   <domain domain_ref="grid_T" /> 
     298   <scalar /> 
     299      </grid> 
     300      <grid id="diadetide_grid_U_2D" > 
     301   <domain domain_ref="grid_U" /> 
     302   <scalar /> 
     303      </grid> 
     304      <grid id="diadetide_grid_V_2D" > 
     305   <domain domain_ref="grid_V" /> 
     306   <scalar /> 
     307      </grid> 
     308      <grid id="diadetide_grid_2D_to_grid_T_3D" > 
     309   <domain domain_ref="grid_T" /> 
     310        <axis axis_ref="deptht"> 
     311          <duplicate_scalar /> 
     312        </axis> 
     313      </grid> 
     314      <grid id="diadetide_grid_2D_to_grid_U_3D" > 
     315   <domain domain_ref="grid_U" /> 
     316        <axis axis_ref="depthu"> 
     317          <duplicate_scalar /> 
     318        </axis> 
     319      </grid> 
     320      <grid id="diadetide_grid_2D_to_grid_V_3D" > 
     321   <domain domain_ref="grid_V" /> 
     322        <axis axis_ref="depthv"> 
     323          <duplicate_scalar /> 
     324        </axis> 
     325      </grid> 
     326      <grid id="diadetide_grid_2D_to_grid_W_3D" > 
     327   <domain domain_ref="grid_W" /> 
     328        <axis axis_ref="depthw"> 
     329          <duplicate_scalar /> 
     330        </axis> 
     331      </grid> 
     332 
     333    </grid_definition> 
  • NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/namelist_ref

    r12172 r12184  
    646646!----------------------------------------------------------------------- 
    647647   ln_tide     = .false.      ! Activate tides 
     648      nn_tide_var   = 1          !  Variant of tidal parameter set and tide-potential computation 
     649      !                          !     (1: default; 0: compatibility with previous versions) 
     650      ln_tide_dia   = .false.    !  Enable tidal diagnostic output 
    648651      ln_tide_pot   = .false.               !  use tidal potential forcing 
     652         rn_tide_gamma = 0.7                   ! Tidal tilt factor 
    649653         ln_scal_load  = .false.               ! Use scalar approximation for 
    650654            rn_scal_load = 0.094               !     load potential 
     
    653657            ! 
    654658      ln_tide_ramp  = .false.               !  Use linear ramp for tides at startup 
    655          rdttideramp   =    0.                 !  ramp duration in days 
    656       clname(1)    = 'DUMMY'               !  name of constituent - all tidal components must be set in namelist_cfg 
     659         rn_tide_ramp_dt = 0.               !  ramp duration in days 
     660      sn_tide_cnames(1) = 'DUMMY'               !  name of constituent - all tidal components must be set in namelist_cfg 
    657661/ 
    658662!----------------------------------------------------------------------- 
     
    730734   filtide          = 'bdydta/amm12_bdytide_'   !  file name root of tidal forcing files 
    731735   ln_bdytide_2ddta = .false.                   ! 
    732    ln_bdytide_conj  = .false.                   ! 
    733736/ 
    734737 
     
    11961199!!   namdiu       Cool skin and warm layer models                       (default: OFF) 
    11971200!!   namflo       float parameters                                      (default: OFF) 
    1198 !!   nam_diaharm  Harmonic analysis of tidal constituents               (default: OFF) 
    11991201!!   nam_diadct   transports through some sections                      (default: OFF) 
    12001202!!   nam_diatmb   Top Middle Bottom Output                              (default: OFF) 
     
    12491251      ln_ariane   = .true.    !    Input with Ariane tool convention(T) 
    12501252      ln_flo_ascii= .true.    !    Output with Ariane tool netcdf convention(F) or ascii file (T) 
    1251 / 
    1252 !----------------------------------------------------------------------- 
    1253 &nam_diaharm   !   Harmonic analysis of tidal constituents              (default: OFF) 
    1254 !----------------------------------------------------------------------- 
    1255     ln_diaharm = .false.   ! Choose tidal harmonic output or not 
    1256        nit000_han = 1      !    First time step used for harmonic analysis 
    1257        nitend_han = 75     !    Last time step used for harmonic analysis 
    1258        nstep_han  = 15     !    Time step frequency for harmonic analysis 
    1259        tname(1)   = 'M2'   !    Name of tidal constituents 
    1260        tname(2)   = 'K1'   !              --- 
    12611253/ 
    12621254!----------------------------------------------------------------------- 
Note: See TracChangeset for help on using the changeset viewer.