Changeset 12184 for NEMO/branches/2019
- Timestamp:
- 2019-12-11T14:35:26+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019
- Files:
-
- 7 deleted
- 44 edited
- 3 copied
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019
- Property svn:externals
-
old new 2 2 ^/utils/build/makenemo@HEAD makenemo 3 3 ^/utils/build/mk@HEAD mk 4 ^/utils/tools @HEADtools4 ^/utils/tools_dev_r11751_ENHANCE-05_SimonM-Harmonic_Analysis@HEAD tools 5 5 ^/vendors/AGRIF/dev@HEAD ext/AGRIF 6 6 ^/vendors/FCM@HEAD ext/FCM
-
- Property svn:externals
-
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/1_namelist_cfg
r12154 r12184 381 381 !! namdiu Cool skin and warm layer models (default: OFF) 382 382 !! namflo float parameters (default: OFF) 383 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)384 383 !! nam_diadct transports through some sections (default: OFF) 385 384 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/2_namelist_cfg
r12154 r12184 330 330 !! namdiu Cool skin and warm layer models (default: OFF) 331 331 !! namflo float parameters (default: OFF) 332 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)333 332 !! nam_diadct transports through some sections (default: OFF) 334 333 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/3_namelist_cfg
r12154 r12184 312 312 !! namdiu Cool skin and warm layer models (default: OFF) 313 313 !! namflo float parameters (default: OFF) 314 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)315 314 !! nam_diadct transports through some sections (default: OFF) 316 315 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AGRIF_DEMO/EXPREF/namelist_cfg
r12154 r12184 381 381 !! namdiu Cool skin and warm layer models (default: OFF) 382 382 !! namflo float parameters (default: OFF) 383 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)384 383 !! nam_diadct transports through some sections (default: OFF) 385 384 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/context_nemo.xml
r12109 r12184 22 22 <field_definition src="./field_def_nemo-oce.xml"/> <!-- NEMO ocean dynamics --> 23 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> 76 24 77 <!-- Files definition --> 25 78 <file_definition src="./file_def_nemo-oce.xml"/> <!-- NEMO ocean dynamics --> 79 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 100 <!-- 26 101 27 102 <!-- Axis definition --> -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/file_def_nemo-oce.xml
r10641 r12184 49 49 50 50 <file_group id="25h_mean" output_freq="1d" output_level="10" enabled=".TRUE."> 51 52 51 53 52 <file id="file12" name_suffix="_25hourm_grid_T" description="ocean T grid variables, 25h meaned" enabled=".TRUE." > -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/AMM12/EXPREF/namelist_cfg
r11536 r12184 154 154 &nam_tide ! tide parameters (default: OFF) 155 155 !----------------------------------------------------------------------- 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' 174 173 / 175 174 !----------------------------------------------------------------------- … … 351 350 !! namdiu Cool skin and warm layer models (default: OFF) 352 351 !! namflo float parameters (default: OFF) 353 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)354 352 !! nam_diadct transports through some sections (default: OFF) 355 353 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/C1D_PAPA/EXPREF/namelist_cfg
r12154 r12184 420 420 !! namdiu Cool skin and warm layer models (default: OFF) 421 421 !! namflo float parameters (default: OFF) 422 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)423 422 !! nam_diadct transports through some sections (default: OFF) 424 423 !! nam_diatmb Top Middle Bottom Output (default: OFF) … … 448 447 / 449 448 !----------------------------------------------------------------------- 450 &nam_diaharm ! Harmonic analysis of tidal constituents (default: OFF)451 !-----------------------------------------------------------------------452 /453 !-----------------------------------------------------------------------454 449 &nam_diadct ! transports through some sections (default: OFF) 455 450 !----------------------------------------------------------------------- -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_BFM/EXPREF/namelist_cfg
r11536 r12184 228 228 !! namdiu Cool skin and warm layer models (default: OFF) 229 229 !! namflo float parameters (default: OFF) 230 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)231 230 !! nam_diadct transports through some sections (default: OFF) 232 231 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/GYRE_PISCES/EXPREF/namelist_cfg
r11536 r12184 222 222 !! namdiu Cool skin and warm layer models (default: OFF) 223 223 !! namflo float parameters (default: OFF) 224 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)225 224 !! nam_diadct transports through some sections (default: OFF) 226 225 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg
r12154 r12184 391 391 !! namdiu Cool skin and warm layer models (default: OFF) 392 392 !! namflo float parameters (default: OFF) 393 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)394 393 !! nam_diadct transports through some sections (default: OFF) 395 394 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_PISCES/EXPREF/namelist_cfg
r11536 r12184 377 377 !! namdiu Cool skin and warm layer models (default: OFF) 378 378 !! namflo float parameters (default: OFF) 379 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)380 379 !! nam_diadct transports through some sections (default: OFF) 381 380 !! nam_diatmb Top Middle Bottom Output (default: OFF) … … 405 404 / 406 405 !----------------------------------------------------------------------- 407 &nam_diaharm ! Harmonic analysis of tidal constituents (default: OFF)408 !-----------------------------------------------------------------------409 /410 !-----------------------------------------------------------------------411 406 &nam_diadct ! transports through some sections (default: OFF) 412 407 !----------------------------------------------------------------------- -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_OFF_TRC/EXPREF/namelist_cfg
r11536 r12184 375 375 !! namdiu Cool skin and warm layer models (default: OFF) 376 376 !! namflo float parameters (default: OFF) 377 !! nam_diaharm Harmonic analysis of tidal constituents ("key_diaharm")378 377 !! namdct transports through some sections ("key_diadct") 379 378 !! nam_diatmb Top Middle Bottom Output (default: OFF) … … 403 402 / 404 403 !----------------------------------------------------------------------- 405 &nam_diaharm ! Harmonic analysis of tidal constituents ("key_diaharm")406 !-----------------------------------------------------------------------407 /408 !-----------------------------------------------------------------------409 404 &namdct ! transports through some sections ("key_diadct") 410 405 !----------------------------------------------------------------------- -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/ORCA2_SAS_ICE/EXPREF/namelist_cfg
r12154 r12184 196 196 !! namdiu Cool skin and warm layer models (default: OFF) 197 197 !! namflo float parameters (default: OFF) 198 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)199 198 !! nam_diadct transports through some sections (default: OFF) 200 199 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/field_def_nemo-oce.xml
r12172 r12184 1 1 <?xml version="1.0"?> 2 2 <!-- $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> 3 75 4 76 <!-- … … 8 80 ============================================================================================================ 9 81 --> 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> 11 102 12 103 <!-- … … 138 229 139 230 <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" /> 213 252 </field_group> 214 253 -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SHARED/grid_def_nemo.xml
r12109 r12184 1 <?xml version="1.0"?> 1 2 <!-- 2 3 ============================================================================================================ … … 4 5 ============================================================================================================ 5 6 --> 6 7 7 8 <grid_definition> 8 9 … … 240 241 <scalar/> 241 242 </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 646 646 !----------------------------------------------------------------------- 647 647 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 648 651 ln_tide_pot = .false. ! use tidal potential forcing 652 rn_tide_gamma = 0.7 ! Tidal tilt factor 649 653 ln_scal_load = .false. ! Use scalar approximation for 650 654 rn_scal_load = 0.094 ! load potential … … 653 657 ! 654 658 ln_tide_ramp = .false. ! Use linear ramp for tides at startup 655 r dttideramp = 0.! ramp duration in days656 clname(1)= 'DUMMY' ! name of constituent - all tidal components must be set in namelist_cfg659 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 657 661 / 658 662 !----------------------------------------------------------------------- … … 730 734 filtide = 'bdydta/amm12_bdytide_' ! file name root of tidal forcing files 731 735 ln_bdytide_2ddta = .false. ! 732 ln_bdytide_conj = .false. !733 736 / 734 737 … … 1196 1199 !! namdiu Cool skin and warm layer models (default: OFF) 1197 1200 !! namflo float parameters (default: OFF) 1198 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)1199 1201 !! nam_diadct transports through some sections (default: OFF) 1200 1202 !! nam_diatmb Top Middle Bottom Output (default: OFF) … … 1249 1251 ln_ariane = .true. ! Input with Ariane tool convention(T) 1250 1252 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 not1256 nit000_han = 1 ! First time step used for harmonic analysis1257 nitend_han = 75 ! Last time step used for harmonic analysis1258 nstep_han = 15 ! Time step frequency for harmonic analysis1259 tname(1) = 'M2' ! Name of tidal constituents1260 tname(2) = 'K1' ! ---1261 1253 / 1262 1254 !----------------------------------------------------------------------- -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/cfgs/SPITZ12/EXPREF/namelist_cfg
r12154 r12184 138 138 &nam_tide ! tide parameters (default: OFF) 139 139 !----------------------------------------------------------------------- 140 ln_tide = .true. ! Activate tides141 ln_tide_pot = .false.! use tidal potential forcing142 clname(1) = 'M2'! name of constituent143 clname(2)= 'S2'144 clname(3)= 'N2'145 clname(4)= 'K2'146 clname(5)= 'K1'147 clname(6)= 'O1'148 clname(7)= 'P1'149 clname(8)= 'Q1'140 ln_tide = .true. ! Activate tides 141 ln_tide_pot = .false. ! use tidal potential forcing 142 sn_tide_cnames(1) = 'M2' ! name of constituent 143 sn_tide_cnames(2) = 'S2' 144 sn_tide_cnames(3) = 'N2' 145 sn_tide_cnames(4) = 'K2' 146 sn_tide_cnames(5) = 'K1' 147 sn_tide_cnames(6) = 'O1' 148 sn_tide_cnames(7) = 'P1' 149 sn_tide_cnames(8) = 'Q1' 150 150 / 151 151 !----------------------------------------------------------------------- … … 348 348 !! namdiu Cool skin and warm layer models (default: OFF) 349 349 !! namflo float parameters (default: OFF) 350 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)351 350 !! nam_diadct transports through some sections (default: OFF) 352 351 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/doc/latex/NEMO/subfiles/chap_DIA.tex
r11693 r12184 1580 1580 1581 1581 %% ================================================================================================= 1582 \section[Harmonic analysis of tidal constituents (\texttt{\textbf{key\_diaharm}})]{Harmonic analysis of tidal constituents (\protect\key{diaharm})}1583 \label{sec:DIA_diag_harm}1584 1585 \begin{listing}1586 \nlst{nam_diaharm}1587 \caption{\forcode{&nam_diaharm}}1588 \label{lst:nam_diaharm}1589 \end{listing}1590 1591 A module is available to compute the amplitude and phase of tidal waves.1592 This on-line Harmonic analysis is actived with \key{diaharm}.1593 1594 Some parameters are available in namelist \nam{_diaharm}{\_diaharm}:1595 1596 - \np{nit000_han}{nit000\_han} is the first time step used for harmonic analysis1597 1598 - \np{nitend_han}{nitend\_han} is the last time step used for harmonic analysis1599 1600 - \np{nstep_han}{nstep\_han} is the time step frequency for harmonic analysis1601 1602 % - \np{nb_ana}{nb\_ana} is the number of harmonics to analyse1603 1604 - \np{tname}{tname} is an array with names of tidal constituents to analyse1605 1606 \np{nit000_han}{nit000\_han} and \np{nitend_han}{nitend\_han} must be between \np{nit000}{nit000} and \np{nitend}{nitend} of the simulation.1607 The restart capability is not implemented.1608 1609 The Harmonic analysis solve the following equation:1610 1611 \[1612 h_{i} - A_{0} + \sum^{nb\_ana}_{j=1}[A_{j}cos(\nu_{j}t_{j}-\phi_{j})] = e_{i}1613 \]1614 1615 With $A_{j}$, $\nu_{j}$, $\phi_{j}$, the amplitude, frequency and phase for each wave and $e_{i}$ the error.1616 $h_{i}$ is the sea level for the time $t_{i}$ and $A_{0}$ is the mean sea level. \\1617 We can rewrite this equation:1618 1619 \[1620 h_{i} - A_{0} + \sum^{nb\_ana}_{j=1}[C_{j}cos(\nu_{j}t_{j})+S_{j}sin(\nu_{j}t_{j})] = e_{i}1621 \]1622 1623 with $A_{j}=\sqrt{C^{2}_{j}+S^{2}_{j}}$ and $\phi_{j}=arctan(S_{j}/C_{j})$.1624 1625 We obtain in output $C_{j}$ and $S_{j}$ for each tidal wave.1626 1627 %% =================================================================================================1628 1582 \section[Transports across sections (\texttt{\textbf{key\_diadct}})]{Transports across sections (\protect\key{diadct})} 1629 1583 \label{sec:DIA_diag_dct} -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdydta.F90
r12049 r12184 23 23 USE phycst ! physical constants 24 24 USE sbcapr ! atmospheric pressure forcing 25 USE sbctide ! Tidal forcing or not25 USE tide_mod, ONLY: ln_tide ! tidal forcing 26 26 USE bdy_oce ! ocean open boundary conditions 27 27 USE bdytides ! tidal forcing at boundaries … … 75 75 CONTAINS 76 76 77 SUBROUTINE bdy_dta( kt, k it, kt_offset )77 SUBROUTINE bdy_dta( kt, kt_offset ) 78 78 !!---------------------------------------------------------------------- 79 79 !! *** SUBROUTINE bdy_dta *** … … 85 85 !!---------------------------------------------------------------------- 86 86 INTEGER, INTENT(in) :: kt ! ocean time-step index 87 INTEGER, INTENT(in), OPTIONAL :: kit ! subcycle time-step index (for timesplitting option) 88 INTEGER, INTENT(in), OPTIONAL :: kt_offset ! time offset in units of timesteps. NB. if kit 89 ! ! is present then units = subcycle timesteps. 87 INTEGER, INTENT(in), OPTIONAL :: kt_offset ! time offset in units of timesteps 90 88 ! ! kt_offset = 0 => get data at "now" time level 91 89 ! ! kt_offset = -1 => get data at "before" time level … … 105 103 ! Initialise data arrays once for all from initial conditions where required 106 104 !--------------------------------------------------------------------------- 107 IF( kt == nit000 .AND. .NOT.PRESENT(kit)) THEN105 IF( kt == nit000 ) THEN 108 106 109 107 ! Calculate depth-mean currents … … 216 214 ! read/update all bdy data 217 215 ! ------------------------ 218 CALL fld_read( kt, 1, bf_alias, k it = kit, kt_offset = kt_offset )216 CALL fld_read( kt, 1, bf_alias, kt_offset = kt_offset ) 219 217 220 218 ! apply some corrections in some specific cases... … … 275 273 END DO 276 274 ENDIF ! ltotvel 277 278 ! update tidal harmonic forcing279 IF( PRESENT(kit) .AND. nn_dyn2d_dta(jbdy) .GE. 2 ) THEN280 CALL bdytide_update( kt = kt, idx = idx_bdy(jbdy), dta = dta_alias, td = tides(jbdy), &281 & kit = kit, kt_offset = kt_offset )282 ENDIF283 275 284 276 ! atm surface pressure : add inverted barometer effect to ssh if it was read -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdyini.F90
r11536 r12184 22 22 USE bdydta ! open boundary cond. setting (bdy_dta_init routine) 23 23 USE bdytides ! open boundary cond. setting (bdytide_init routine) 24 USE sbctide ! Tidal forcing or not24 USE tide_mod, ONLY: ln_tide ! tidal forcing 25 25 USE phycst , ONLY: rday 26 26 ! -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/BDY/bdytides.F90
r11536 r12184 18 18 USE phycst ! physical constants 19 19 USE bdy_oce ! ocean open boundary conditions 20 USE tide ini!20 USE tide_mod ! 21 21 USE daymod ! calendar 22 22 ! … … 30 30 31 31 PUBLIC bdytide_init ! routine called in bdy_init 32 PUBLIC bdytide_update ! routine called in bdy_dta33 32 PUBLIC bdy_dta_tides ! routine called in dyn_spg_ts 34 33 … … 45 44 TYPE(OBC_DATA) , PUBLIC, DIMENSION(jp_bdy) :: dta_bdy_s !: bdy external data (slow component) 46 45 46 INTEGER :: kt_tide 47 47 48 !!---------------------------------------------------------------------- 48 49 !! NEMO/OCE 4.0 , NEMO Consortium (2018) … … 64 65 CHARACTER(len=80) :: filtide !: Filename root for tidal input files 65 66 LOGICAL :: ln_bdytide_2ddta !: If true, read 2d harmonic data 66 LOGICAL :: ln_bdytide_conj !: If true, assume complex conjugate tidal data67 67 !! 68 68 INTEGER :: ib_bdy, itide, ib !: dummy loop indices … … 77 77 TYPE(TIDES_DATA), POINTER :: td !: local short cut 78 78 !! 79 NAMELIST/nambdy_tide/filtide, ln_bdytide_2ddta , ln_bdytide_conj79 NAMELIST/nambdy_tide/filtide, ln_bdytide_2ddta 80 80 !!---------------------------------------------------------------------- 81 81 ! … … 105 105 IF(lwp) WRITE(numout,*) ' Namelist nambdy_tide : tidal harmonic forcing at open boundaries' 106 106 IF(lwp) WRITE(numout,*) ' read tidal data in 2d files: ', ln_bdytide_2ddta 107 IF(lwp) WRITE(numout,*) ' assume complex conjugate : ', ln_bdytide_conj108 107 IF(lwp) WRITE(numout,*) ' Number of tidal components to read: ', nb_harmo 109 108 IF(lwp) THEN 110 109 WRITE(numout,*) ' Tidal components: ' 111 110 DO itide = 1, nb_harmo 112 WRITE(numout,*) ' ', Wave(ntide(itide))%cname_tide111 WRITE(numout,*) ' ', tide_harmonics(itide)%cname_tide 113 112 END DO 114 113 ENDIF … … 151 150 igrd = 1 ! Everything is at T-points here 152 151 DO itide = 1, nb_harmo 153 CALL iom_get( inum, jpdom_autoglo, TRIM( Wave(ntide(itide))%cname_tide)//'_z1', ztr(:,:) )154 CALL iom_get( inum, jpdom_autoglo, TRIM( Wave(ntide(itide))%cname_tide)//'_z2', zti(:,:) )152 CALL iom_get( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_z1', ztr(:,:) ) 153 CALL iom_get( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_z2', zti(:,:) ) 155 154 DO ib = 1, ilen0(igrd) 156 155 ii = idx_bdy(ib_bdy)%nbi(ib,igrd) … … 168 167 igrd = 2 ! Everything is at U-points here 169 168 DO itide = 1, nb_harmo 170 CALL iom_get ( inum, jpdom_autoglo, TRIM( Wave(ntide(itide))%cname_tide)//'_u1', ztr(:,:) )171 CALL iom_get ( inum, jpdom_autoglo, TRIM( Wave(ntide(itide))%cname_tide)//'_u2', zti(:,:) )169 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_u1', ztr(:,:) ) 170 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_u2', zti(:,:) ) 172 171 DO ib = 1, ilen0(igrd) 173 172 ii = idx_bdy(ib_bdy)%nbi(ib,igrd) … … 185 184 igrd = 3 ! Everything is at V-points here 186 185 DO itide = 1, nb_harmo 187 CALL iom_get ( inum, jpdom_autoglo, TRIM( Wave(ntide(itide))%cname_tide)//'_v1', ztr(:,:) )188 CALL iom_get ( inum, jpdom_autoglo, TRIM( Wave(ntide(itide))%cname_tide)//'_v2', zti(:,:) )186 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_v1', ztr(:,:) ) 187 CALL iom_get ( inum, jpdom_autoglo, TRIM(tide_harmonics(itide)%cname_tide)//'_v2', zti(:,:) ) 189 188 DO ib = 1, ilen0(igrd) 190 189 ii = idx_bdy(ib_bdy)%nbi(ib,igrd) … … 210 209 DO itide = 1, nb_harmo 211 210 ! ! SSH fields 212 clfile = TRIM(filtide)//TRIM( Wave(ntide(itide))%cname_tide)//'_grid_T.nc'211 clfile = TRIM(filtide)//TRIM(tide_harmonics(itide)%cname_tide)//'_grid_T.nc' 213 212 CALL iom_open( clfile, inum ) 214 213 CALL fld_map( inum, 'z1' , dta_read(1:ilen0(1),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,1) ) … … 218 217 CALL iom_close( inum ) 219 218 ! ! U fields 220 clfile = TRIM(filtide)//TRIM( Wave(ntide(itide))%cname_tide)//'_grid_U.nc'219 clfile = TRIM(filtide)//TRIM(tide_harmonics(itide)%cname_tide)//'_grid_U.nc' 221 220 CALL iom_open( clfile, inum ) 222 221 CALL fld_map( inum, 'u1' , dta_read(1:ilen0(2),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,2) ) … … 226 225 CALL iom_close( inum ) 227 226 ! ! V fields 228 clfile = TRIM(filtide)//TRIM( Wave(ntide(itide))%cname_tide)//'_grid_V.nc'227 clfile = TRIM(filtide)//TRIM(tide_harmonics(itide)%cname_tide)//'_grid_V.nc' 229 228 CALL iom_open( clfile, inum ) 230 229 CALL fld_map( inum, 'v1' , dta_read(1:ilen0(3),1:1,1:1) , 1, idx_bdy(ib_bdy)%nbmap(:,3) ) … … 240 239 ENDIF ! ln_bdytide_2ddta=.true. 241 240 ! 242 IF( ln_bdytide_conj ) THEN ! assume complex conjugate in data files243 td%ssh0(:,:,2) = - td%ssh0(:,:,2)244 td%u0 (:,:,2) = - td%u0 (:,:,2)245 td%v0 (:,:,2) = - td%v0 (:,:,2)246 ENDIF247 !248 241 ! Allocate slow varying data in the case of time splitting: 249 242 ! Do it anyway because at this stage knowledge of free surface scheme is unknown … … 260 253 ! 261 254 END SUBROUTINE bdytide_init 262 263 264 SUBROUTINE bdytide_update( kt, idx, dta, td, kit, kt_offset )265 !!----------------------------------------------------------------------266 !! *** SUBROUTINE bdytide_update ***267 !!268 !! ** Purpose : - Add tidal forcing to ssh, u2d and v2d OBC data arrays.269 !!270 !!----------------------------------------------------------------------271 INTEGER , INTENT(in ) :: kt ! Main timestep counter272 TYPE(OBC_INDEX) , INTENT(in ) :: idx ! OBC indices273 TYPE(OBC_DATA) , INTENT(inout) :: dta ! OBC external data274 TYPE(TIDES_DATA) , INTENT(inout) :: td ! tidal harmonics data275 INTEGER, OPTIONAL, INTENT(in ) :: kit ! Barotropic timestep counter (for timesplitting option)276 INTEGER, OPTIONAL, INTENT(in ) :: kt_offset ! time offset in units of timesteps. NB. if kit277 ! ! is present then units = subcycle timesteps.278 ! ! kt_offset = 0 => get data at "now" time level279 ! ! kt_offset = -1 => get data at "before" time level280 ! ! kt_offset = +1 => get data at "after" time level281 ! ! etc.282 !283 INTEGER :: itide, igrd, ib ! dummy loop indices284 INTEGER :: time_add ! time offset in units of timesteps285 INTEGER, DIMENSION(3) :: ilen0 ! length of boundary data (from OBC arrays)286 REAL(wp) :: z_arg, z_sarg, zflag, zramp ! local scalars287 REAL(wp), DIMENSION(jpmax_harmo) :: z_sist, z_cost288 !!----------------------------------------------------------------------289 !290 ilen0(1) = SIZE(td%ssh(:,1,1))291 ilen0(2) = SIZE(td%u(:,1,1))292 ilen0(3) = SIZE(td%v(:,1,1))293 294 zflag=1295 IF ( PRESENT(kit) ) THEN296 IF ( kit /= 1 ) zflag=0297 ENDIF298 299 IF ( (nsec_day == NINT(0.5_wp * rdt) .OR. kt==nit000) .AND. zflag==1 ) THEN300 !301 kt_tide = kt - (nsec_day - 0.5_wp * rdt)/rdt302 !303 IF(lwp) THEN304 WRITE(numout,*)305 WRITE(numout,*) 'bdytide_update : (re)Initialization of the tidal bdy forcing at kt=',kt306 WRITE(numout,*) '~~~~~~~~~~~~~~ '307 ENDIF308 !309 CALL tide_init_elevation ( idx, td )310 CALL tide_init_velocities( idx, td )311 !312 ENDIF313 314 time_add = 0315 IF( PRESENT(kt_offset) ) THEN316 time_add = kt_offset317 ENDIF318 319 IF( PRESENT(kit) ) THEN320 z_arg = ((kt-kt_tide) * rdt + (kit+0.5_wp*(time_add-1)) * rdt / REAL(nn_baro,wp) )321 ELSE322 z_arg = ((kt-kt_tide)+time_add) * rdt323 ENDIF324 325 ! Linear ramp on tidal component at open boundaries326 zramp = 1._wp327 IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg + (kt_tide-nit000)*rdt)/(rdttideramp*rday),0._wp),1._wp)328 329 DO itide = 1, nb_harmo330 z_sarg = z_arg * omega_tide(itide)331 z_cost(itide) = COS( z_sarg )332 z_sist(itide) = SIN( z_sarg )333 END DO334 335 DO itide = 1, nb_harmo336 igrd=1 ! SSH on tracer grid337 DO ib = 1, ilen0(igrd)338 dta%ssh(ib) = dta%ssh(ib) + zramp*(td%ssh(ib,itide,1)*z_cost(itide) + td%ssh(ib,itide,2)*z_sist(itide))339 END DO340 igrd=2 ! U grid341 DO ib = 1, ilen0(igrd)342 dta%u2d(ib) = dta%u2d(ib) + zramp*(td%u (ib,itide,1)*z_cost(itide) + td%u (ib,itide,2)*z_sist(itide))343 END DO344 igrd=3 ! V grid345 DO ib = 1, ilen0(igrd)346 dta%v2d(ib) = dta%v2d(ib) + zramp*(td%v (ib,itide,1)*z_cost(itide) + td%v (ib,itide,2)*z_sist(itide))347 END DO348 END DO349 !350 END SUBROUTINE bdytide_update351 255 352 256 … … 392 296 ! Linear ramp on tidal component at open boundaries 393 297 zramp = 1. 394 IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg - nit000*rdt)/(r dttideramp*rday),0.),1.)298 IF (ln_tide_ramp) zramp = MIN(MAX( (z_arg - nit000*rdt)/(rn_tide_ramp_dt*rday),0.),1.) 395 299 396 300 DO ib_bdy = 1,nb_bdy … … 433 337 DO itide = 1, nb_harmo 434 338 ! 435 z_sarg = (z_arg + zoff) * omega_tide(itide)339 z_sarg = (z_arg + zoff) * tide_harmonics(itide)%omega 436 340 z_cost = zramp * COS( z_sarg ) 437 341 z_sist = zramp * SIN( z_sarg ) … … 491 395 END DO 492 396 DO ib = 1 , ilen0(igrd) 493 mod_tide(ib)=mod_tide(ib)* ftide(itide)494 phi_tide(ib)=phi_tide(ib)+ v0tide(itide)+utide(itide)397 mod_tide(ib)=mod_tide(ib)*tide_harmonics(itide)%f 398 phi_tide(ib)=phi_tide(ib)+tide_harmonics(itide)%v0+tide_harmonics(itide)%u 495 399 ENDDO 496 400 DO ib = 1 , ilen0(igrd) … … 530 434 END DO 531 435 DO ib = 1, ilen0(igrd) 532 mod_tide(ib)=mod_tide(ib)* ftide(itide)533 phi_tide(ib)=phi_tide(ib)+ v0tide(itide)+utide(itide)436 mod_tide(ib)=mod_tide(ib)*tide_harmonics(itide)%f 437 phi_tide(ib)=phi_tide(ib)+tide_harmonics(itide)%v0 + tide_harmonics(itide)%u 534 438 ENDDO 535 439 DO ib = 1, ilen0(igrd) … … 551 455 END DO 552 456 DO ib = 1, ilen0(igrd) 553 mod_tide(ib)=mod_tide(ib)* ftide(itide)554 phi_tide(ib)=phi_tide(ib)+ v0tide(itide)+utide(itide)457 mod_tide(ib)=mod_tide(ib)*tide_harmonics(itide)%f 458 phi_tide(ib)=phi_tide(ib)+tide_harmonics(itide)%v0 + tide_harmonics(itide)%u 555 459 ENDDO 556 460 DO ib = 1, ilen0(igrd) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg.F90
r11536 r12184 21 21 USE dynspg_exp ! surface pressure gradient (dyn_spg_exp routine) 22 22 USE dynspg_ts ! surface pressure gradient (dyn_spg_ts routine) 23 USE sbctide ! 24 USE updtide ! 23 USE tide_mod ! 25 24 USE trd_oce ! trends: ocean variables 26 25 USE trddyn ! trend manager: dynamics … … 43 42 INTEGER, PARAMETER :: np_EXP = 0 ! explicit time stepping 44 43 INTEGER, PARAMETER :: np_NO =-1 ! no surface pressure gradient, no scheme 44 ! 45 REAL(wp) :: zt0step ! Time of day at the beginning of the time step 45 46 46 47 !! * Substitutions … … 113 114 IF( .NOT.ln_dynspg_ts .AND. ( ln_tide_pot .AND. ln_tide ) ) THEN ! N.B. added directly at sub-time-step in ts-case 114 115 ! 115 CALL upd_tide( kt ) ! update tide potential 116 ! Update tide potential at the beginning of current time step 117 zt0step = REAL(nsec_day, wp)-0.5_wp*rdt 118 CALL upd_tide(zt0step) 116 119 ! 117 120 DO jj = 2, jpjm1 ! add tide potential forcing -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/DYN/dynspg_ts.F90
r12166 r12184 44 44 USE bdytides ! open boundary condition data 45 45 USE bdydyn2d ! open boundary conditions on barotropic variables 46 USE sbctide ! tides 47 USE updtide ! tide potential 46 USE tide_mod ! 48 47 USE sbcwave ! surface wave 49 48 USE diatmb ! Top,middle,bottom output … … 170 169 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: ztwdmask, zuwdmask, zvwdmask ! ROMS wetting and drying masks at t,u,v points 171 170 REAL(wp), ALLOCATABLE, DIMENSION(:,:) :: zuwdav2, zvwdav2 ! averages over the sub-steps of zuwdmask and zvwdmask 171 REAL(wp) :: zt0substep ! Time of day at the beginning of the time substep 172 172 !!---------------------------------------------------------------------- 173 173 ! … … 442 442 ! 443 443 IF( ln_bdy .AND. ln_tide ) CALL bdy_dta_tides( kt, kit=jn, kt_offset= noffset+1 ) 444 IF( ln_tide_pot .AND. ln_tide ) CALL upd_tide ( kt, kit=jn, kt_offset= noffset ) 444 ! Update tide potential at the beginning of current time substep 445 IF( ln_tide_pot .AND. ln_tide ) THEN 446 zt0substep = REAL(nsec_day, wp) - 0.5_wp*rdt + (jn + noffset - 1) * rdt / REAL(nn_baro, wp) 447 CALL upd_tide(zt0substep) 448 END IF 445 449 ! 446 450 ! !== extrapolation at mid-step ==! (jn+1/2) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/IOM/iom.F90
r12166 r12184 56 56 LOGICAL, PUBLIC, PARAMETER :: lk_iomput = .FALSE. !: iom_put flag 57 57 #endif 58 PUBLIC iom_init, iom_ swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var58 PUBLIC iom_init, iom_init_closedef, iom_swap, iom_open, iom_close, iom_setkt, iom_varid, iom_get, iom_get_var 59 59 PUBLIC iom_chkatt, iom_getatt, iom_putatt, iom_getszuld, iom_rstput, iom_delay_rst, iom_put 60 PUBLIC iom_use, iom_context_finalize, iom_ miss_val60 PUBLIC iom_use, iom_context_finalize, iom_update_file_name, iom_miss_val 61 61 62 62 PRIVATE iom_rp0d, iom_rp1d, iom_rp2d, iom_rp3d … … 65 65 #if defined key_iomput 66 66 PRIVATE iom_set_domain_attr, iom_set_axis_attr, iom_set_field_attr, iom_set_file_attr, iom_get_file_attr, iom_set_grid_attr 67 PRIVATE set_grid, set_grid_bounds, set_scalar, set_xmlatt, set_mooring, iom_ update_file_name, iom_sdate67 PRIVATE set_grid, set_grid_bounds, set_scalar, set_xmlatt, set_mooring, iom_sdate 68 68 PRIVATE iom_set_rst_context, iom_set_rstw_active, iom_set_rstr_active 69 69 # endif … … 93 93 CONTAINS 94 94 95 SUBROUTINE iom_init( cdname, fname, ld_tmppatch )95 SUBROUTINE iom_init( cdname, fname, ld_tmppatch, ld_closedef ) 96 96 !!---------------------------------------------------------------------- 97 97 !! *** ROUTINE *** … … 103 103 CHARACTER(len=*), OPTIONAL, INTENT(in) :: fname 104 104 LOGICAL , OPTIONAL, INTENT(in) :: ld_tmppatch 105 LOGICAL , OPTIONAL, INTENT(in) :: ld_closedef 105 106 #if defined key_iomput 106 107 ! … … 117 118 INTEGER :: nldi_save, nlei_save !: and close boundaries in output files 118 119 INTEGER :: nldj_save, nlej_save !: 120 LOGICAL :: ll_closedef = .TRUE. 119 121 !!---------------------------------------------------------------------- 120 122 ! … … 131 133 IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 132 134 ENDIF 135 IF ( PRESENT(ld_closedef) ) ll_closedef = ld_closedef 133 136 ! 134 137 ALLOCATE( zt_bnds(2,jpk), zw_bnds(2,jpk) ) … … 269 272 ENDIF 270 273 ! 271 ! end file definition274 ! set time step length 272 275 dtime%second = rdt 273 276 CALL xios_set_timestep( dtime ) 274 CALL xios_close_context_definition() 275 CALL xios_update_calendar( 0 ) 277 ! 278 ! conditional closure of context definition 279 IF ( ll_closedef ) CALL iom_init_closedef 276 280 ! 277 281 DEALLOCATE( zt_bnds, zw_bnds ) … … 284 288 ! 285 289 END SUBROUTINE iom_init 290 291 SUBROUTINE iom_init_closedef 292 !!---------------------------------------------------------------------- 293 !! *** SUBROUTINE iom_init_closedef *** 294 !!---------------------------------------------------------------------- 295 !! 296 !! ** Purpose : Closure of context definition 297 !! 298 !!---------------------------------------------------------------------- 299 300 CALL xios_close_context_definition() 301 CALL xios_update_calendar( 0 ) 302 303 END SUBROUTINE iom_init_closedef 286 304 287 305 SUBROUTINE iom_set_rstw_var_active(field) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/nemogcm.F90
r12166 r12184 46 46 USE closea ! treatment of closed seas (for ln_closea) 47 47 USE usrdef_nam ! user defined configuration 48 USE tide ini ! tidal components initialization (tide_iniroutine)48 USE tide_mod, ONLY : tide_init ! tidal components initialization (tide_init routine) 49 49 USE bdy_oce, ONLY : ln_bdy 50 50 USE bdyini ! open boundary cond. setting (bdy_init routine) … … 59 59 USE diaobs ! Observation diagnostics (dia_obs_init routine) 60 60 USE diacfl ! CFL diagnostics (dia_cfl_init routine) 61 USE dia harm ! tidal harmonics diagnostics (dia_harm_init routine)61 USE diamlr ! IOM context management for multiple-linear-regression analysis 62 62 USE step ! NEMO time-stepping (stp routine) 63 63 USE isfstp ! ice shelf (isf_stp_init routine) … … 75 75 USE diatmb ! Top,middle,bottom output 76 76 USE dia25h ! 25h mean output 77 USE diadetide ! Weights computation for daily detiding of model diagnostics 77 78 USE sbc_oce , ONLY : lk_oasis 78 79 USE wet_dry ! Wetting and drying setting (wad_init routine) … … 491 492 CALL dia_tmb_init ! TMB outputs 492 493 CALL dia_25h_init ! 25h mean outputs 493 CALL dia_ harm_init ! tidal harmonics outputs494 CALL dia_detide_init ! Weights computation for daily detiding of model diagnostics 494 495 IF( ln_diaobs ) CALL dia_obs( nit000-1 ) ! Observation operator for restart 496 CALL dia_mlr_init ! Initialisation of IOM context management for multiple-linear-regression analysis 495 497 496 498 ! ! Assimilation increments -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step.F90
r12166 r12184 100 100 101 101 IF( kstp == nit000 ) THEN ! initialize IOM context (must be done after nemo_init for AGRIF+XIOS+OASIS) 102 CALL iom_init( cxios_context ) ! for model grid (including passible AGRIF zoom) 102 CALL iom_init( cxios_context, ld_closedef=.FALSE. ) ! for model grid (including passible AGRIF zoom) 103 IF( lk_diamlr ) CALL dia_mlr_iom_init ! with additional setup for multiple-linear-regression analysis 104 CALL iom_init_closedef 103 105 IF( ln_crs ) CALL iom_init( TRIM(cxios_context)//"_crs" ) ! for coarse grid 104 106 ENDIF … … 110 112 ! Update external forcing (tides, open boundaries, and surface boundary condition (including sea-ice) 111 113 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 112 IF( ln_tide ) CALL sbc_tide( kstp )! update tide potential114 IF( ln_tide ) CALL tide_update( kstp ) ! update tide potential 113 115 IF( ln_apr_dyn ) CALL sbc_apr ( kstp ) ! atmospheric pressure (NB: call before bdy_dta which needs ssh_ib) 114 116 IF( ln_bdy ) CALL bdy_dta ( kstp, kt_offset = +1 ) ! update dynamic & tracer data at open boundaries … … 209 211 CALL dia_ar5 ( kstp ) ! ar5 diag 210 212 CALL dia_ptr ( kstp ) ! Poleward adv/ldf TRansports diagnostics 211 IF( ln_diaharm ) CALL dia_harm( kstp ) ! Tidal harmonic analysis212 213 CALL dia_wri ( kstp ) ! ocean model: outputs 213 214 ! 215 IF( lk_diadetide ) CALL dia_detide( kstp ) ! Weights computation for daily detiding of model diagnostics 216 IF( lk_diamlr ) CALL dia_mlr ! Update time used in multiple-linear-regression analysis 214 217 IF( ln_crs ) CALL crs_fld ( kstp ) ! ocean model: online field coarsening & output 215 218 -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/src/OCE/step_oce.F90
r12166 r12184 19 19 USE sbccpl ! surface boundary condition: coupled formulation (call send at end of step) 20 20 USE sbcapr ! surface boundary condition: atmospheric pressure 21 USE sbctide ! Tide initialisation21 USE tide_mod, ONLY : ln_tide, tide_update 22 22 USE sbcwave ! Wave intialisation 23 23 … … 83 83 USE diahth ! thermocline depth (dia_hth routine) 84 84 USE diahsb ! heat, salt and volume budgets (dia_hsb routine) 85 USE diaharm86 85 USE diacfl 87 86 USE diaobs ! Observation operator 87 USE diadetide ! Weights computation for daily detiding of model diagnostics 88 USE diamlr ! IOM context management for multiple-linear-regression analysis 88 89 USE flo_oce ! floats variables 89 90 USE floats ! floats computation (flo_stp routine) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/field_def_nemo-oce.xml
r9572 r12184 110 110 <field id="tpt_dep" long_name="T-point depth" standard_name="depth_below_geoid" unit="m" grid_ref="grid_T_3D" /> 111 111 <field id="e3tdef" long_name="T-cell thickness deformation" unit="%" grid_ref="grid_T_3D" /> 112 </field_group>113 114 <!-- Tides -->115 116 <field_group id="Tides_T" grid_ref="grid_T_2D" operation="once" >117 <!-- tidal composante -->118 <field id="M2x" long_name="M2 Elevation harmonic real part " unit="m" />119 <field id="M2y" long_name="M2 Elevation harmonic imaginary part" unit="m" />120 <field id="S2x" long_name="S2 Elevation harmonic real part " unit="m" />121 <field id="S2y" long_name="S2 Elevation harmonic imaginary part" unit="m" />122 <field id="N2x" long_name="N2 Elevation harmonic real part " unit="m" />123 <field id="N2y" long_name="N2 Elevation harmonic imaginary part" unit="m" />124 <field id="K1x" long_name="K1 Elevation harmonic real part " unit="m" />125 <field id="K1y" long_name="K1 Elevation harmonic imaginary part" unit="m" />126 <field id="O1x" long_name="O1 Elevation harmonic real part " unit="m" />127 <field id="O1y" long_name="O1 Elevation harmonic imaginary part" unit="m" />128 <field id="Q1x" long_name="Q1 Elevation harmonic real part " unit="m" />129 <field id="Q1y" long_name="Q1 Elevation harmonic imaginary part" unit="m" />130 <field id="M4x" long_name="M4 Elevation harmonic real part " unit="m" />131 <field id="M4y" long_name="M4 Elevation harmonic imaginary part" unit="m" />132 <field id="K2x" long_name="K2 Elevation harmonic real part " unit="m" />133 <field id="K2y" long_name="K2 Elevation harmonic imaginary part" unit="m" />134 <field id="P1x" long_name="P1 Elevation harmonic real part " unit="m" />135 <field id="P1y" long_name="P1 Elevation harmonic imaginary part" unit="m" />136 <field id="Mfx" long_name="Mf Elevation harmonic real part " unit="m" />137 <field id="Mfy" long_name="Mf Elevation harmonic imaginary part" unit="m" />138 <field id="Mmx" long_name="Mm Elevation harmonic real part " unit="m" />139 <field id="Mmy" long_name="Mm Elevation harmonic imaginary part" unit="m" />140 </field_group>141 142 <field_group id="Tides_U" grid_ref="grid_U_2D" operation="once" >143 <field id="M2x_u" long_name="M2 current barotrope along i-axis harmonic real part " unit="m/s" />144 <field id="M2y_u" long_name="M2 current barotrope along i-axis harmonic imaginary part " unit="m/s" />145 <field id="S2x_u" long_name="S2 current barotrope along i-axis harmonic real part " unit="m/s" />146 <field id="S2y_u" long_name="S2 current barotrope along i-axis harmonic imaginary part " unit="m/s" />147 <field id="N2x_u" long_name="N2 current barotrope along i-axis harmonic real part " unit="m/s" />148 <field id="N2y_u" long_name="N2 current barotrope along i-axis harmonic imaginary part " unit="m/s" />149 <field id="K1x_u" long_name="K1 current barotrope along i-axis harmonic real part " unit="m/s" />150 <field id="K1y_u" long_name="K1 current barotrope along i-axis harmonic imaginary part " unit="m/s" />151 <field id="O1x_u" long_name="O1 current barotrope along i-axis harmonic real part " unit="m/s" />152 <field id="O1y_u" long_name="O1 current barotrope along i-axis harmonic imaginary part " unit="m/s" />153 <field id="Q1x_u" long_name="Q1 current barotrope along i-axis harmonic real part " unit="m/s" />154 <field id="Q1y_u" long_name="Q1 current barotrope along i-axis harmonic imaginary part " unit="m/s" />155 <field id="M4x_u" long_name="M4 current barotrope along i-axis harmonic real part " unit="m/s" />156 <field id="M4y_u" long_name="M4 current barotrope along i-axis harmonic imaginary part " unit="m/s" />157 <field id="K2x_u" long_name="K2 current barotrope along i-axis harmonic real part " unit="m/s" />158 <field id="K2y_u" long_name="K2 current barotrope along i-axis harmonic imaginary part " unit="m/s" />159 <field id="P1x_u" long_name="P1 current barotrope along i-axis harmonic real part " unit="m/s" />160 <field id="P1y_u" long_name="P1 current barotrope along i-axis harmonic imaginary part " unit="m/s" />161 <field id="Mfx_u" long_name="Mf current barotrope along i-axis harmonic real part " unit="m/s" />162 <field id="Mfy_u" long_name="Mf current barotrope along i-axis harmonic imaginary part " unit="m/s" />163 <field id="Mmx_u" long_name="Mm current barotrope along i-axis harmonic real part " unit="m/s" />164 <field id="Mmy_u" long_name="Mm current barotrope along i-axis harmonic imaginary part " unit="m/s" />165 </field_group>166 167 <field_group id="Tides_V" grid_ref="grid_V_2D" operation="once" >168 <field id="M2x_v" long_name="M2 current barotrope along j-axis harmonic real part " unit="m/s" />169 <field id="M2y_v" long_name="M2 current barotrope along j-axis harmonic imaginary part " unit="m/s" />170 <field id="S2x_v" long_name="S2 current barotrope along j-axis harmonic real part " unit="m/s" />171 <field id="S2y_v" long_name="S2 current barotrope along j-axis harmonic imaginary part " unit="m/s" />172 <field id="N2x_v" long_name="N2 current barotrope along j-axis harmonic real part " unit="m/s" />173 <field id="N2y_v" long_name="N2 current barotrope along j-axis harmonic imaginary part " unit="m/s" />174 <field id="K1x_v" long_name="K1 current barotrope along j-axis harmonic real part " unit="m/s" />175 <field id="K1y_v" long_name="K1 current barotrope along j-axis harmonic imaginary part " unit="m/s" />176 <field id="O1x_v" long_name="O1 current barotrope along j-axis harmonic real part " unit="m/s" />177 <field id="O1y_v" long_name="O1 current barotrope along j-axis harmonic imaginary part " unit="m/s" />178 <field id="Q1x_v" long_name="Q1 current barotrope along j-axis harmonic real part " unit="m/s" />179 <field id="Q1y_v" long_name="Q1 current barotrope along j-axis harmonic imaginary part " unit="m/s" />180 <field id="M4x_v" long_name="M4 current barotrope along j-axis harmonic real part " unit="m/s" />181 <field id="M4y_v" long_name="M4 current barotrope along j-axis harmonic imaginary part " unit="m/s" />182 <field id="K2x_v" long_name="K2 current barotrope along j-axis harmonic real part " unit="m/s" />183 <field id="K2y_v" long_name="K2 current barotrope along j-axis harmonic imaginary part " unit="m/s" />184 <field id="P1x_v" long_name="P1 current barotrope along j-axis harmonic real part " unit="m/s" />185 <field id="P1y_v" long_name="P1 current barotrope along j-axis harmonic imaginary part " unit="m/s" />186 <field id="Mfx_v" long_name="Mf current barotrope along j-axis harmonic real part " unit="m/s" />187 <field id="Mfy_v" long_name="Mf current barotrope along j-axis harmonic imaginary part " unit="m/s" />188 <field id="Mmx_v" long_name="Mm current barotrope along j-axis harmonic real part " unit="m/s" />189 <field id="Mmy_v" long_name="Mm current barotrope along j-axis harmonic imaginary part " unit="m/s" />190 112 </field_group> 191 113 -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/CANAL/EXPREF/namelist_cfg
r11536 r12184 276 276 !! namdiu Cool skin and warm layer models (default: OFF) 277 277 !! namflo float parameters (default: OFF) 278 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)279 278 !! nam_diadct transports through some sections (default: OFF) 280 279 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_120pts
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_240pts
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV1D/EXPREF/namelist_cfg_60pts
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_ADV2D/EXPREF/namelist_cfg
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/1_namelist_cfg
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ICE_AGRIF/EXPREF/namelist_cfg
r11536 r12184 202 202 !! namdiu Cool skin and warm layer models (default: OFF) 203 203 !! namflo float parameters (default: OFF) 204 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)205 204 !! nam_diadct transports through some sections (default: OFF) 206 205 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/ISOMIP/EXPREF/namelist_cfg
r12166 r12184 428 428 !! namdiu Cool skin and warm layer models (default: OFF) 429 429 !! namflo float parameters (default: OFF) 430 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)431 430 !! nam_diadct transports through some sections (default: OFF) 432 431 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/LOCK_EXCHANGE/EXPREF/namelist_FCT2_flux_ubs_cfg
r12166 r12184 276 276 !! namdiu Cool skin and warm layer models (default: OFF) 277 277 !! namflo float parameters (default: OFF) 278 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)279 278 !! nam_diadct transports through some sections (default: OFF) 280 279 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/OVERFLOW/EXPREF/namelist_zps_FCT4_flux_ubs_cfg
r11848 r12184 294 294 !! namdiu Cool skin and warm layer models (default: OFF) 295 295 !! namflo float parameters (default: OFF) 296 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)297 296 !! nam_diadct transports through some sections (default: OFF) 298 297 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/1_namelist_cfg
r11536 r12184 273 273 !! namdiu Cool skin and warm layer models (default: OFF) 274 274 !! namflo float parameters (default: OFF) 275 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)276 275 !! nam_diadct transports through some sections (default: OFF) 277 276 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/VORTEX/EXPREF/namelist_cfg
r11536 r12184 264 264 !! namdiu Cool skin and warm layer models (default: OFF) 265 265 !! namflo float parameters (default: OFF) 266 !! nam_diaharm Harmonic analysis of tidal constituents (default; OFF)267 266 !! nam_diadct transports through some sections (default: OFF) 268 267 !! nam_diatmb Top Middle Bottom Output (default: OFF) -
NEMO/branches/2019/dev_r12072_MERGE_OPTION2_2019/tests/WAD/EXPREF/namelist_cfg
r11536 r12184 422 422 !! namdiu Cool skin and warm layer models (default: OFF) 423 423 !! namflo float parameters (default: OFF) 424 !! nam_diaharm Harmonic analysis of tidal constituents (default: OFF)425 424 !! nam_diadct transports through some sections (default: OFF) 426 425 !! nam_diatmb Top Middle Bottom Output (default: OFF)
Note: See TracChangeset
for help on using the changeset viewer.