Changeset 6071 for branches/2015/dev_merge_2015
- Timestamp:
- 2015-12-16T17:05:18+01:00 (8 years ago)
- Location:
- branches/2015/dev_merge_2015/NEMOGCM
- Files:
-
- 7 added
- 17 edited
- 2 copied
-
ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm (modified) (1 prop)
-
ARCH/arch-ALTIX_NAUTILUS_MPT.fcm (modified) (1 prop)
-
CONFIG/AMM12/EXP00/iodef.xml (modified) (2 diffs)
-
CONFIG/AMM12/EXP00/namelist_cfg (modified) (1 diff)
-
CONFIG/ORCA2_LIM/EXP00/namelist_cfg (modified) (1 diff)
-
CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm (modified) (1 diff)
-
CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg (modified) (1 diff)
-
CONFIG/SHARED/field_def.xml (modified) (3 diffs)
-
CONFIG/SHARED/namelist_ref (modified) (9 diffs, 1 prop)
-
CONFIG/cfg.txt (modified) (1 diff)
-
CONFIG/uspcfg.txt (modified) (1 diff)
-
SETTE/BATCH_TEMPLATE/batch-XC40_METO (modified) (2 diffs)
-
SETTE/input_ORCA2_LIM.cfg (modified) (1 diff)
-
SETTE/prepare_job.sh (modified) (2 diffs)
-
SETTE/sette.sh (modified) (3 diffs)
-
TOOLS/OBSTOOLS/src/obs_prof_io.F90 (added)
-
TOOLS/OBSTOOLS/src/obs_sla_io.F90 (added)
-
TOOLS/OBSTOOLS/src/obs_sla_types.F90 (added)
-
TOOLS/OBSTOOLS/src/obs_vel_io.F90 (added)
-
TOOLS/OBSTOOLS/src/obsprof_io.h90 (added)
-
TOOLS/OBSTOOLS/src/obssla_io.h90 (added)
-
TOOLS/OBSTOOLS/src/obssla_types.h90 (added)
-
TOOLS/REBUILD_NEMO/icb_combrest.py (copied) (copied from branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/REBUILD_NEMO/icb_combrest.py)
-
TOOLS/SCOORD_GEN (copied) (copied from branches/2015/dev_MetOffice_merge_2015/NEMOGCM/TOOLS/SCOORD_GEN)
-
fcm-make/inc/keys-orca2_lim.cfg (modified) (1 diff)
-
fcm-make/inc/keys-orca2_lim3.cfg (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2015/dev_merge_2015/NEMOGCM/ARCH/OLD/NOC/arch-ALTIX_NAUTILUS.fcm
- Property svn:keywords set to Id
-
branches/2015/dev_merge_2015/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
- Property svn:keywords set to Id
-
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml
r5385 r6071 25 25 <file_group id="1ts" output_freq="1ts" output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 26 26 27 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files --> 27 <!--old <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> old --> <!-- 1h files --> 28 <!-- TMB files --> 29 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE." > 30 31 <file id="file9" name_suffix="_shelftmb_grid_T" description="ocean T grid variables" enabled=".TRUE." > 32 <field field_ref="top_temp" name="votemper_top" operation="instant" enabled=".TRUE." /> 33 <field field_ref="mid_temp" name="votemper_mid" operation="instant" enabled=".TRUE." /> 34 <field field_ref="bot_temp" name="votemper_bot" operation="instant" enabled=".TRUE." /> 35 <field field_ref="sshnmasked" name="sossheig" operation="instant" enabled=".TRUE." /> 36 <field field_ref="top_sal" name="vosaline_top" operation="instant" enabled=".TRUE." /> 37 <field field_ref="mid_sal" name="vosaline_mid" operation="instant" enabled=".TRUE." /> 38 <field field_ref="bot_sal" name="vosaline_bot" operation="instant" enabled=".TRUE." /> 39 </file> 40 41 <file id="file10" name_suffix="_shelftmb_grid_U" description="TMB ocean U grid variables" enabled=".TRUE." > 42 <field field_ref="top_u" name="vozocrtx_top" operation="instant" /> 43 <field field_ref="mid_u" name="vozocrtx_mid" operation="instant" /> 44 <field field_ref="bot_u" name="vozocrtx_bot" operation="instant" /> 45 <field field_ref="baro_u" name="vobtcrtx" operation="instant" /> 46 </file> 47 48 <file id="file11" name_suffix="_shelftmb_grid_V" description="TMB ocean V grid variables" enabled=".TRUE." > 49 <field field_ref="top_v" name="vomecrty_top" operation="instant" /> 50 <field field_ref="mid_v" name="vomecrty_mid" operation="instant" /> 51 <field field_ref="bot_v" name="vomecrty_bot" operation="instant" /> 52 <field field_ref="baro_v" name="vobtcrty" operation="instant" /> 53 </file> 54 55 </file_group> 56 28 57 <file_group id="2h" output_freq="2h" output_level="10" enabled=".TRUE."/> <!-- 2h files --> 29 58 <file_group id="3h" output_freq="3h" output_level="10" enabled=".TRUE."/> <!-- 3h files --> 30 59 <file_group id="4h" output_freq="4h" output_level="10" enabled=".TRUE."/> <!-- 4h files --> 31 60 <file_group id="6h" output_freq="6h" output_level="10" enabled=".TRUE."/> <!-- 6h files --> 61 62 <file_group id="25h_mean" output_freq="1d" output_level="10" enabled=".TRUE."> 63 64 65 <file id="file12" name_suffix="_25hourm_grid_T" description="ocean T grid variables, 25h meaned" enabled=".TRUE." > 66 <field field_ref="temper25h" name="votemper" operation="instant" enabled=".TRUE."/> 67 <field field_ref="tempis25h" name="votempis" operation="instant" enabled=".TRUE."/> 68 <field field_ref="salin25h" name="vosaline" operation="instant" enabled=".TRUE."/> 69 <field field_ref="ssh25h" name="sossheig" operation="instant" enabled=".TRUE."/> 70 </file> 71 72 <file id="file13" name_suffix="_25hourm_grid_U" description="ocean U grid variables, 25h meaned" enabled=".TRUE." > 73 <field field_ref="vozocrtx25h" name="vozocrtx" operation="instant" enabled=".TRUE."/> 74 </file> 75 76 <file id="file14" name_suffix="_25hourm_grid_V" description="ocean V grid variables, 25h meaned" enabled=".TRUE." > 77 <field field_ref="vomecrty25h" name="vomecrty" operation="instant" enabled=".TRUE."/> 78 </file> 79 80 <file id="file15" name_suffix="_25hourm_grid_W" description="ocean W grid variables, 25h meaned" enabled=".TRUE." > 81 <field field_ref="vomecrtz25h" name="vomerctz" operation="instant" enabled=".TRUE."/> 82 <field field_ref="woce" name="vovecrtz" operation="instant" enabled=".TRUE."/> 83 <field field_ref="avt25h" name="votkeavt" operation="instant" enabled=".TRUE."/> 84 <field field_ref="avm25h" name="votkeavm" operation="instant" enabled=".TRUE."/> 85 <field field_ref="tke25h" name="votke" operation="instant" enabled=".TRUE."/> 86 <field field_ref="mxln25h" name="mxln" operation="instant" enabled=".TRUE."/> 87 </file> 88 </file_group> 32 89 33 90 <file_group id="1d" output_freq="1d" output_level="10" enabled=".TRUE."> <!-- 1d files --> … … 98 155 <file_group id="5y" output_freq="5y" output_level="10" enabled=".TRUE."/> <!-- real 5y files --> 99 156 <file_group id="10y" output_freq="10y" output_level="10" enabled=".TRUE."/> <!-- real 10y files --> 157 100 158 101 159 </file_definition> -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/AMM12/EXP00/namelist_cfg
r6060 r6071 446 446 !----------------------------------------------------------------------- 447 447 / 448 !----------------------------------------------------------------------- 449 &nam_diatmb ! Top Middle Bottom Output 450 !----------------------------------------------------------------------- 451 ln_diatmb = .true. ! Choose Top Middle and Bottom output or not 452 / 453 !----------------------------------------------------------------------- 454 &nam_dia25h ! 25h Mean Output 455 !----------------------------------------------------------------------- 456 ln_dia25h = .true. ! Choose 25h mean output or not 457 / 458 -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist_cfg
r6060 r6071 259 259 / 260 260 !----------------------------------------------------------------------- 261 &namobs ! observation usage ('key_diaobs')261 &namobs ! observation usage 262 262 !----------------------------------------------------------------------- 263 263 / -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM3/cpp_ORCA2_LIM3.fcm
r6060 r6071 1 bld::tool::fppkeys key_trabbl key_lim3 key_zdftke key_zdfddm key_zdftmx key_mpp_mpi key_diaobs key_asminc key_iomputkey_nosignedzero1 bld::tool::fppkeys key_trabbl key_lim3 key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc key_nosignedzero -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/1_namelist_cfg
r6060 r6071 868 868 ln_ignmis = .true. ! Logical switch for ignoring missing files 869 869 ! endailyavtypes ENACT daily average types 870 ln_grid_global = .true.871 870 ln_grid_search_lookup = .false. 872 871 / -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/field_def.xml
r6060 r6071 40 40 <field id="sstgrad2" long_name="square of module of sst gradient" unit="degC2/m2" /> 41 41 <field id="sbt" long_name="sea bottom temperature" unit="degC" /> 42 42 <field id="sst_wl" long_name="Delta SST of warm layer" unit="degC" /> 43 <field id="sst_cs" long_name="Delta SST of cool skin" unit="degC" /> 44 <field id="temp_3m" long_name="temperature at 3m" unit="degC" /> 45 43 46 <field id="sss" long_name="sea surface salinity" standard_name="sea_surface_salinity" unit="1e-3" /> 44 47 <field id="sss2" long_name="square of sea surface salinity" unit="1e-6" > sss * sss </field > … … 197 200 198 201 <!-- * variable related to ice shelf forcing * --> 199 <field id="fwfisf" long_name="Ice shelf melting" unit="kg/m2/s" /> 200 <field id="qisf" long_name="Ice Shelf Heat Flux" unit="W/m2" /> 201 <field id="isfgammat" long_name="transfert coefficient for isf (temperature)" unit="m/s" /> 202 <field id="isfgammas" long_name="transfert coefficient for isf (salinity)" unit="m/s" /> 203 <field id="stbl" long_name="salinity in the Losh tbl" unit="1e-3" /> 204 <field id="ttbl" long_name="temperature in the Losh tbl" unit="degC" /> 202 <field id="fwfisf" long_name="Ice shelf melting" unit="Kg/m2/s" /> 203 <field id="qisf" long_name="Ice Shelf Heat Flux" unit="W/m2" /> 204 <field id="isfgammat" long_name="transfert coefficient for isf (temperature) " unit="m/s" /> 205 <field id="isfgammas" long_name="transfert coefficient for isf (salinity) " unit="m/s" /> 206 <field id="stbl" long_name="salinity in the Losh tbl " unit="PSU" /> 207 <field id="ttbl" long_name="temperature in the Losh tbl " unit="C" /> 208 <field id="utbl" long_name="zonal current in the Losh tbl at T point " unit="m/s" /> 209 <field id="vtbl" long_name="merid current in the Losh tbl at T point " unit="m/s" /> 210 <field id="thermald" long_name="thermal driving of ice shelf melting " unit="C" /> 211 <field id="tfrz" long_name="top freezing point (used to compute melt) " unit="C" /> 212 <field id="tinsitu" long_name="top insitu temperature (used to cmpt melt) " unit="C" /> 213 <field id="ustar" long_name="ustar at T point used in ice shelf melting " unit="m/s" /> 205 214 206 215 <!-- *_oce variables available with ln_blk_clio or ln_blk_core --> … … 1039 1048 <field field_ref="woce" name="wo" long_name="ocean vertical velocity" /> 1040 1049 </field_group> 1041 1050 1051 <!-- TMB diagnostic output --> 1052 <field_group id="1h_grid_T_tmb" grid_ref="grid_T_2D" operation="instant"> 1053 <field id="top_temp" name="votemper_top" unit="degC" /> 1054 <field id="mid_temp" name="votemper_mid" unit="degC" /> 1055 <field id="bot_temp" name="votemper_bot" unit="degC" /> 1056 <field id="top_sal" name="vosaline_top" unit="psu" /> 1057 <field id="mid_sal" name="vosaline_mid" unit="psu" /> 1058 <field id="bot_sal" name="vosaline_bot" unit="psu" /> 1059 <field id="sshnmasked" name="sossheig" unit="m" /> 1060 </field_group> 1061 <field_group id="1h_grid_U_tmb" grid_ref="grid_U_2D" operation="instant"> 1062 <field id="top_u" name="vozocrtx_top" unit="m/s" /> 1063 <field id="mid_u" name="vozocrtx_mid" unit="m/s" /> 1064 <field id="bot_u" name="vozocrtx_bot" unit="m/s" /> 1065 <field id="baro_u" name="vobtcrtx" unit="m/s" /> 1066 </field_group> 1067 <field_group id="1h_grid_V_tmb" grid_ref="grid_V_2D" operation="instant"> 1068 <field id="top_v" name="vomecrty_top" unit="m/s" /> 1069 <field id="mid_v" name="vomecrty_mid" unit="m/s" /> 1070 <field id="bot_v" name="vomecrty_bot" unit="m/s" /> 1071 <field id="baro_v" name="vobtcrty" unit="m/s" /> 1072 </field_group> 1073 <!-- 25h diagnostic output --> 1074 <field_group id="25h_grid_T" grid_ref="grid_T_3D" operation="instant"> 1075 <field id="temper25h" name="potential temperature 25h mean" unit="degC" /> 1076 <field id="tempis25h" name="insitu temperature 25h mean" unit="degC" /> 1077 <field id="salin25h" name="salinity 25h mean" unit="psu" /> 1078 <field id="ssh25h" name="sea surface height 25h mean" grid_ref="grid_T_2D" unit="m" /> 1079 </field_group> 1080 1081 <field_group id="25h_grid_U" grid_ref="grid_U_3D" operation="instant" > 1082 <field id="vozocrtx25h" name="i current 25h mean" unit="m/s" /> 1083 </field_group> 1084 1085 <field_group id="25h_grid_V" grid_ref="grid_V_3D" operation="instant"> 1086 <field id="vomecrty25h" name="j current 25h mean" unit="m/s" /> 1087 </field_group> 1088 1089 <field_group id="25h_grid_W" grid_ref="grid_W_3D" operation="instant"> 1090 <field id="vomecrtz25h" name="k current 25h mean" unit="m/s" /> 1091 <field id="avt25h" name="vertical diffusivity25h mean" unit="m2/s" /> 1092 <field id="avm25h" name="vertical viscosity 25h mean" unit="m2/s" /> 1093 <field id="tke25h" name="turbulent kinetic energy 25h mean" /> 1094 <field id="mxln25h" name="mixing length 25h mean" unit="m" /> 1095 </field_group> 1096 1097 1042 1098 1043 1099 </field_definition> -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/SHARED/namelist_ref
- Property svn:keywords set to Id
r6060 r6071 31 31 nn_itend = 5475 ! last time step (std 5475) 32 32 nn_date0 = 010101 ! date at nit_0000 (format yyyymmdd) used if ln_rstart=F or (ln_rstart=T and nn_rstctl=0 or 1) 33 nn_time0 = 0 ! initial time of day in hhmm 33 34 nn_leapy = 0 ! Leap year calendar (1) or not (0) 34 35 ln_rstart = .false. ! start from rest (F) or from a restart file (T) … … 42 43 cn_ocerst_out = "restart" ! suffix of ocean restart name (output) 43 44 cn_ocerst_outdir = "." ! directory in which to write output ocean restarts 45 ln_iscpl = .false. ! cavity evolution forcing or coupling to ice sheet model 44 46 nn_istate = 0 ! output the initial state (1) or not (0) 45 47 ln_rst_list = .false. ! output restarts at list of times using nn_stocklist (T) or at set frequency with nn_stock (F) … … 132 134 nn_msh = 1 ! create (=1) a mesh file or not (=0) 133 135 rn_hmin = -3. ! min depth of the ocean (>0) or min number of ocean level (<0) 136 rn_isfhmin = 1.00 ! treshold (m) to discriminate grounding ice to floating ice 134 137 rn_e3zps_min= 20. ! partial step thickness is set larger than the minimum of 135 138 rn_e3zps_rat= 0.1 ! rn_e3zps_min and rn_e3zps_rat*e3t, with 0<rn_e3zps_rat<1 … … 230 233 !! namsbc_cpl CouPLed formulation ("key_oasis3" ) 231 234 !! namsbc_sas StAndalone Surface module 232 !! namtra_qsr penetrative solar radiation (ln_traqsr =T) 233 !! namsbc_rnf river runoffs (ln_rnf =T) 234 !! namsbc_isf ice shelf melting/freezing (nn_isf >0) 235 !! namsbc_apr Atmospheric Pressure (ln_apr_dyn =T) 236 !! namsbc_ssr sea surface restoring term (for T and/or S) (ln_ssr =T) 235 !! namtra_qsr penetrative solar radiation 236 !! namsbc_rnf river runoffs 237 !! namsbc_isf ice shelf melting/freezing 238 !! namsbc_iscpl coupling option between land ice model and ocean 239 !! namsbc_apr Atmospheric Pressure 240 !! namsbc_ssr sea surface restoring term (for T and/or S) 237 241 !! namsbc_alb albedo parameters 238 242 !! namsbc_wave external fields from wave model (ln_wave =T) … … 279 283 ! =2 annual global mean of e-p-r set to zero 280 284 ln_apr_dyn = .false. ! Patm gradient added in ocean & ice Eqs. (T => fill namsbc_apr ) 281 nn_isf = 0 ! ice shelf melting/freezing (/=0 => fill namsbc_isf) 282 ! 0 =no isf 1 = presence of ISF 283 ! 2 = bg03 parametrisation 3 = rnf file for isf 284 ! 4 = ISF fwf specified 285 ! option 1 and 4 need ln_isfcav = .true. (domzgr) 285 ln_isf = .false. ! ice shelf (T => fill namsbc_isf) 286 286 ln_wave = .false. ! coupling with surface wave (T => fill namsbc_wave) 287 287 nn_lsm = 0 ! =0 land/sea mask for input fields is not applied (keep empty land/sea mask filename field) , … … 453 453 &namsbc_isf ! Top boundary layer (ISF) (nn_isf >0) 454 454 !----------------------------------------------------------------------- 455 ! ! file name ! frequency (hours) ! variable ! time interp . ! clim ! 'yearly'/ ! weights ! rotation!456 ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing!455 ! ! file name ! frequency (hours) ! variable ! time interpol. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask ! 456 ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename ! 457 457 ! nn_isf == 4 458 sn_qisf = 'rnfisf' , -12 ,'sohflisf', .false. , .true. , 'yearly' , '' , '' 459 sn_fwfisf = 'rnfisf' , -12 ,'sowflisf', .false. , .true. , 'yearly' , '' , '' 458 sn_fwfisf = 'rnfisf' , -12 ,'sowflisf', .false. , .true. , 'yearly' , '' , '' , '' 460 459 ! nn_isf == 3 461 sn_rnfisf = 'runoffs', -12 ,'sofwfisf', .false. , .true. , 'yearly' , '' ,''460 sn_rnfisf = 'rnfisf' , -12 ,'sofwfisf', .false. , .true. , 'yearly' , '' , '' , '' 462 461 ! nn_isf == 2 and 3 463 sn_depmax_isf = 'r unoffs', -12 ,'sozisfmax', .false. , .true. , 'yearly' , '' ,''464 sn_depmin_isf = 'r unoffs', -12 ,'sozisfmin', .false. , .true. , 'yearly' , '' ,''462 sn_depmax_isf = 'rnfisf' , -12 ,'sozisfmax' , .false. , .true. , 'yearly' , '' , '' , '' 463 sn_depmin_isf = 'rnfisf' , -12 ,'sozisfmin' , .false. , .true. , 'yearly' , '' , '' , '' 465 464 ! nn_isf == 2 466 sn_Leff_isf = 'rnfisf' , 0 ,'Leff' , .false. , .true. , 'yearly' , '' , '' 467 465 sn_Leff_isf = 'rnfisf' , -12 ,'Leff' , .false. , .true. , 'yearly' , '' , '' , '' 468 466 ! for all case 469 ln_divisf = .true. ! apply isf melting as a mass flux or in the salinity trend. (maybe I should remove this option as for runoff?) 467 nn_isf = 1 ! ice shelf melting/freezing 468 ! 1 = presence of ISF 2 = bg03 parametrisation 469 ! 3 = rnf file for isf 4 = ISF fwf specified 470 ! option 1 and 4 need ln_isfcav = .true. (domzgr) 470 471 ! only for nn_isf = 1 or 2 471 472 rn_gammat0 = 1.e-4 ! gammat coefficient used in blk formula 472 473 rn_gammas0 = 1.e-4 ! gammas coefficient used in blk formula 474 ! only for nn_isf = 1 or 4 475 rn_hisf_tbl = 30. ! thickness of the top boundary layer (Losh et al. 2008) 476 ! 0 => thickness of the tbl = thickness of the first wet cell 473 477 ! only for nn_isf = 1 474 nn_isfblk = 1 ! 1 ISOMIP ; 2 conservative (3 equation formulation, Jenkins et al. 1991 ??) 475 rn_hisf_tbl = 30. ! thickness of the top boundary layer (Losh et al. 2008) 476 ! 0 => thickness of the tbl = thickness of the first wet cell 477 ln_conserve = .true. ! conservative case (take into account meltwater advection) 478 nn_isfblk = 1 ! 1 ISOMIP like: 2 equations formulation (Hunter et al., 2006) 479 ! 2 ISOMIP+ like: 3 equations formulation (Asay-Davis et al., 2015) 478 480 nn_gammablk = 1 ! 0 = cst Gammat (= gammat/s) 479 481 ! 1 = velocity dependend Gamma (u* * gammat/s) (Jenkins et al. 2010) 480 ! if you want to keep the cd as in global config, adjust rn_gammat0 to compensate 481 ! 2 = velocity and stability dependent Gamma Holland et al. 1999 482 / 483 !----------------------------------------------------------------------- 484 &namsbc_apr ! Atmospheric pressure forcing (in ocean or bulk) (ln_apr_dyn=T) 482 ! 2 = velocity and stability dependent Gamma (Holland et al. 1999) 483 / 484 !----------------------------------------------------------------------- 485 &namsbc_iscpl ! land ice / ocean coupling option 486 !----------------------------------------------------------------------- 487 nn_drown = 10 ! number of iteration of the extrapolation loop (fill the new wet cells) 488 ln_hsb = .false. ! activate conservation module (conservation exact after a time of rn_fiscpl) 489 nn_fiscpl = 43800 ! (number of time step) conservation period (maybe should be fix to the coupling frequencey of restart frequency) 490 / 491 !----------------------------------------------------------------------- 492 &namsbc_apr ! Atmospheric pressure used as ocean forcing or in bulk 485 493 !----------------------------------------------------------------------- 486 494 ! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask ! … … 1067 1075 ! (no physical validity of the results) 1068 1076 nn_timing = 0 ! timing by routine activated (=1) creates timing.output file, or not (=0) 1077 nn_diacfl = 0 ! Write out cfl diagnostics (=1) in cfl_diagnostics.ascii, or not (=0) 1069 1078 / 1070 1079 !----------------------------------------------------------------------- … … 1176 1185 !! *** Observation & Assimilation *** 1177 1186 !!====================================================================== 1178 !! namobs observation and model comparison ('key_diaobs')1187 !! namobs observation and model comparison 1179 1188 !! nam_asminc assimilation increments ('key_asminc') 1180 1189 !!====================================================================== 1181 1190 ! 1182 1191 !----------------------------------------------------------------------- 1183 &namobs ! observation usage switch ('key_diaobs') 1184 !----------------------------------------------------------------------- 1185 ln_t3d = .false. ! Logical switch for T profile observations 1186 ln_s3d = .false. ! Logical switch for S profile observations 1187 ln_ena = .false. ! Logical switch for ENACT insitu data set 1188 ln_cor = .false. ! Logical switch for Coriolis insitu data set 1189 ln_profb = .false. ! Logical switch for feedback insitu data set 1190 ln_sla = .false. ! Logical switch for SLA observations 1191 ln_sladt = .false. ! Logical switch for AVISO SLA data 1192 ln_slafb = .false. ! Logical switch for feedback SLA data 1193 ln_ssh = .false. ! Logical switch for SSH observations 1194 ln_sst = .false. ! Logical switch for SST observations 1195 ln_reysst = .false. ! Logical switch for Reynolds observations 1196 ln_ghrsst = .false. ! Logical switch for GHRSST observations 1197 ln_sstfb = .false. ! Logical switch for feedback SST data 1198 ln_sss = .false. ! Logical switch for SSS observations 1199 ln_seaice = .false. ! Logical switch for Sea Ice observations 1200 ln_vel3d = .false. ! Logical switch for velocity observations 1201 ln_velavcur= .false ! Logical switch for velocity daily av. cur. 1202 ln_velhrcur= .false ! Logical switch for velocity high freq. cur. 1203 ln_velavadcp=.false. ! Logical switch for velocity daily av. ADCP 1204 ln_velhradcp=.false. ! Logical switch for velocity high freq. ADCP 1205 ln_velfb = .false. ! Logical switch for feedback velocity data 1206 ln_grid_global=.false. ! Global distribtion of observations 1207 ln_grid_search_lookup = .false. ! Logical switch for obs grid search w/lookup table 1208 grid_search_file = 'grid_search' ! Grid search lookup file header 1192 &namobs ! observation usage switch 1193 !----------------------------------------------------------------------- 1194 ln_diaobs = .false. ! Logical switch for the observation operator 1195 ln_t3d = .false. ! Logical switch for T profile observations 1196 ln_s3d = .false. ! Logical switch for S profile observations 1197 ln_sla = .false. ! Logical switch for SLA observations 1198 ln_sst = .false. ! Logical switch for SST observations 1199 ln_sic = .false. ! Logical switch for Sea Ice observations 1200 ln_vel3d = .false. ! Logical switch for velocity observations 1201 ln_altbias = .false. ! Logical switch for altimeter bias correction 1202 ln_nea = .false. ! Logical switch for rejection of observations near land 1203 ln_grid_global = .true. ! Logical switch for global distribution of observations 1204 ln_grid_search_lookup = .false. ! Logical switch for obs grid search w/lookup table 1205 ln_ignmis = .true. ! Logical switch for ignoring missing files 1206 ln_s_at_t = .false. ! Logical switch for computing model S at T obs if not there 1207 ln_sstnight = .false. ! Logical switch for calculating night-time average for SST obs 1209 1208 ! All of the *files* variables below are arrays. Use namelist_cfg to add more files 1210 enactfiles = 'enact.nc' ! ENACT input observation file names (specify full array in namelist_cfg) 1211 coriofiles = 'corio.nc' ! Coriolis input observation file name 1212 profbfiles = 'profiles_01.nc' ! Profile feedback input observation file name 1213 ln_profb_enatim = .false ! Enact feedback input time setting switch 1214 slafilesact = 'sla_act.nc' ! Active SLA input observation file names 1215 slafilespas = 'sla_pass.nc' ! Passive SLA input observation file names 1216 slafbfiles = 'sla_01.nc' ! slafbfiles: Feedback SLA input observation file names 1217 sstfiles = 'ghrsst.nc' ! GHRSST input observation file names 1218 sstfbfiles = 'sst_01.nc' ! Feedback SST input observation file names 1219 seaicefiles = 'seaice_01.nc' ! Sea Ice input observation file names 1220 velavcurfiles = 'velavcurfile.nc' ! Vel. cur. daily av. input file name 1221 velhrcurfiles = 'velhrcurfile.nc' ! Vel. cur. high freq. input file name 1222 velavadcpfiles = 'velavadcpfile.nc' ! Vel. ADCP daily av. input file name 1223 velhradcpfiles = 'velhradcpfile.nc' ! Vel. ADCP high freq. input file name 1224 velfbfiles = 'velfbfile.nc' ! Vel. feedback input observation file name 1225 dobsini = 20000101.000000 ! Initial date in window YYYYMMDD.HHMMSS 1226 dobsend = 20010101.000000 ! Final date in window YYYYMMDD.HHMMSS 1227 n1dint = 0 ! Type of vertical interpolation method 1228 n2dint = 0 ! Type of horizontal interpolation method 1229 ln_nea = .false. ! Rejection of observations near land switch 1230 nmsshc = 0 ! MSSH correction scheme 1231 mdtcorr = 1.61 ! MDT correction 1232 mdtcutoff = 65.0 ! MDT cutoff for computed correction 1233 ln_altbias = .false. ! Logical switch for alt bias 1234 ln_ignmis = .true. ! Logical switch for ignoring missing files 1235 endailyavtypes = 820 ! ENACT daily average types - array (use namelist_cfg to set more values) 1209 cn_profbfiles = 'profiles_01.nc' ! Profile feedback input observation file names 1210 cn_slafbfiles = 'sla_01.nc' ! SLA feedback input observation file names 1211 cn_sstfbfiles = 'sst_01.nc' ! SST feedback input observation file names 1212 cn_sicfbfiles = 'sic_01.nc' ! SIC feedback input observation file names 1213 cn_velfbfiles = 'vel_01.nc' ! Velocity feedback input observation file names 1214 cn_altbiasfile = 'altbias.nc' ! Altimeter bias input file name 1215 cn_gridsearchfile = 'gridsearch.nc' ! Grid search file name 1216 rn_gridsearchres = 0.5 ! Grid search resolution 1217 rn_dobsini = 00010101.000000 ! Initial date in window YYYYMMDD.HHMMSS 1218 rn_dobsend = 00010102.000000 ! Final date in window YYYYMMDD.HHMMSS 1219 nn_1dint = 0 ! Type of vertical interpolation method 1220 nn_2dint = 0 ! Type of horizontal interpolation method 1221 nn_msshc = 0 ! MSSH correction scheme 1222 rn_mdtcorr = 1.61 ! MDT correction 1223 rn_mdtcutoff = 65.0 ! MDT cutoff for computed correction 1224 nn_profdavtypes = -1 ! Profile daily average types - array 1225 ln_sstbias = .false. 1226 cn_sstbias_files = 'sstbias.nc' 1236 1227 / 1237 1228 !----------------------------------------------------------------------- … … 1253 1244 nn_divdmp = 0 ! Number of iterations of divergence damping operator 1254 1245 / 1246 !----------------------------------------------------------------------- 1247 &namsbc_wave ! External fields from wave model 1248 !----------------------------------------------------------------------- 1249 ! ! file name ! frequency (hours) ! variable ! time interp. ! clim ! 'yearly'/ ! weights ! rotation ! land/sea mask ! 1250 ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename ! 1251 sn_cdg = 'cdg_wave' , 1 , 'drag_coeff' , .true. , .false. , 'daily' , '' , '' , '' 1252 sn_usd = 'sdw_wave' , 1 , 'u_sd2d' , .true. , .false. , 'daily' , '' , '' , '' 1253 sn_vsd = 'sdw_wave' , 1 , 'v_sd2d' , .true. , .false. , 'daily' , '' , '' , '' 1254 sn_wn = 'sdw_wave' , 1 , 'wave_num' , .true. , .false. , 'daily' , '' , '' , '' 1255 ! 1256 cn_dir_cdg = './' ! root directory for the location of drag coefficient files 1257 / 1258 !----------------------------------------------------------------------- 1259 &namdyn_nept ! Neptune effect (simplified: lateral and vertical diffusions removed) 1260 !----------------------------------------------------------------------- 1261 ! Suggested lengthscale values are those of Eby & Holloway (1994) for a coarse model 1262 ln_neptsimp = .false. ! yes/no use simplified neptune 1263 1264 ln_smooth_neptvel = .false. ! yes/no smooth zunep, zvnep 1265 rn_tslse = 1.2e4 ! value of lengthscale L at the equator 1266 rn_tslsp = 3.0e3 ! value of lengthscale L at the pole 1267 ! Specify whether to ramp down the Neptune velocity in shallow 1268 ! water, and if so the depth range controlling such ramping down 1269 ln_neptramp = .true. ! ramp down Neptune velocity in shallow water 1270 rn_htrmin = 100.0 ! min. depth of transition range 1271 rn_htrmax = 200.0 ! max. depth of transition range 1272 / 1273 !----------------------------------------------------------------------- 1274 &namdiu ! Cool skin and warm layer modesl 1275 !----------------------------------------------------------------------- 1276 ln_diurnal = .false. 1277 ln_diurnal_only = .false. 1278 / 1279 !----------------------------------------------------------------------- 1280 &nam_diatmb ! Top Middle Bottom Output 1281 !----------------------------------------------------------------------- 1282 ln_diatmb = .false. ! Choose Top Middle and Bottom output or not 1283 / 1284 !----------------------------------------------------------------------- 1285 &nam_dia25h ! 25h Mean Output 1286 !----------------------------------------------------------------------- 1287 ln_dia25h = .false. ! Choose 25h mean output or not 1288 / -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/cfg.txt
r5656 r6071 7 7 AMM12 OPA_SRC 8 8 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 9 GYRE OPA_SRC10 9 ORCA2_LIM3 OPA_SRC LIM_SRC_3 NST_SRC 11 10 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC 12 11 ORCA2_OFF_PISCES OPA_SRC OFF_SRC TOP_SRC 12 GYRE OPA_SRC -
branches/2015/dev_merge_2015/NEMOGCM/CONFIG/uspcfg.txt
r5333 r6071 1 1 ORCA1_CICE # ORCA2_LIM # OPA_SRC TOP_SRC # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ORCA1_CICE/v3.6.0/ORCA1_CICE_ctl.txt 2 2 ISOMIP # GYRE # OPA_SRC # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ISOMIP/v3.6.0/ISOMIP_ctl.txt 3 ISOMIP_r5151_UKMO_ISF # GYRE # OPA_SRC # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ISOMIP_r5151_UKMO_ISF/v3.6.0/ISOMIP_ctl.txt -
branches/2015/dev_merge_2015/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO
r5480 r6071 2 2 #! 3 3 #PBS -N nemo_sette 4 #PBS -l walltime=00: 30:004 #PBS -l walltime=00:08:00 5 5 #PBS -j oe 6 #PBS -q QUEUE6 #PBS -q normal 7 7 #PBS -l SELECT 8 8 … … 77 77 # Run SPMD case 78 78 # 79 if [ $OCORES -gt 32 ] ; then 80 #Still more than one node so run in parallel queue 81 echo time aprun -b -n $OCORES -N $O_PER_NODE ./opa 82 time aprun -b -n $OCORES -N $O_PER_NODE ./opa 83 else 84 echo time mpiexec -n $OCORES ./opa 85 time mpiexec -n $OCORES ./opa 86 fi 79 echo time aprun -b -n $OCORES -N $O_PER_NODE ./opa 80 time aprun -b -n $OCORES -N $O_PER_NODE ./opa 87 81 fi 88 82 # -
branches/2015/dev_merge_2015/NEMOGCM/SETTE/input_ORCA2_LIM.cfg
r5398 r6071 1 ORCA2_LIM_nemo_v3.6 .tar ORCA2_LIM_nemo_v3.61 ORCA2_LIM_nemo_v3.6st.tar ORCA2_LIM_nemo_v3.6 -
branches/2015/dev_merge_2015/NEMOGCM/SETTE/prepare_job.sh
r5559 r6071 266 266 echo NB_XNODES=${NB_XNODES} 267 267 echo Total NB_NODES=${NB_NODES} 268 if [ ${NB_NODES} -eq 1 ] ; then 269 QUEUE=shared 270 #Not using XIOS in detatched mode and using less than one node so should be ok on shared node 271 #Load snplauncher module to allow use of mpiexec 272 SELECT="select=1:ncpus=$((NXIO_PROC + NB_PROC))":mem=15GB 273 module load cray-snplauncher 274 echo 'Shared Queue' 275 else 276 QUEUE=normal 277 SELECT="select=$NB_NODES" 278 module unload cray-snplauncher #Make sure snplauncher module is not loaded 279 echo 'Normal Queue' 280 fi 268 QUEUE=normal 269 SELECT="select=$NB_NODES" 270 module unload cray-snplauncher #Make sure snplauncher module is not loaded 281 271 ;; 282 272 openmpi_NAVITI_MERCATOR) … … 330 320 ;; 331 321 XC40_METO*) 332 cat run_sette_test.job | sed -e"s/QUEUE/${QUEUE}/" \ 333 -e"s/SELECT/${SELECT}/" > run_sette_test1.job 322 cat run_sette_test.job | sed -e"s/SELECT/${SELECT}/" > run_sette_test1.job 334 323 mv run_sette_test1.job run_sette_test.job 335 324 ;; -
branches/2015/dev_merge_2015/NEMOGCM/SETTE/sette.sh
r6060 r6071 1137 1137 export TEST_NAME="REPRO_4_4" 1138 1138 cd ${CONFIG_DIR} 1139 . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM_OBS -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_ diaobs key_asminc" del_key ${DEL_KEYS}1139 . ./makenemo -m ${CMP_NAM} -n ORCA2_LIM_OBS -r ORCA2_LIM -j 8 add_key "key_mpp_rep key_asminc" del_key ${DEL_KEYS} 1140 1140 cd ${SETTE_DIR} 1141 1141 . ./param.cfg … … 1154 1154 set_namelist namelist_cfg jpnj 4 1155 1155 set_namelist namelist_cfg jpnij 16 1156 # set_namelist namelist_cfg nn_solv 2 1156 set_namelist namelist_cfg ln_diaobs .true. 1157 1157 set_namelist namelist_cfg ln_t3d .true. 1158 1158 set_namelist namelist_cfg ln_s3d .true. 1159 set_namelist namelist_cfg ln_profb .true.1160 1159 set_namelist namelist_cfg ln_sst .true. 1161 set_namelist namelist_cfg ln_sstfb .true.1162 1160 set_namelist namelist_cfg ln_sla .true. 1163 set_namelist namelist_cfg ln_s lafb.true.1164 set_namelist namelist_cfg ln_ seaice .false.1161 set_namelist namelist_cfg ln_sic .true. 1162 set_namelist namelist_cfg ln_vel3d .true. 1165 1163 set_namelist namelist_cfg ln_bkgwri .true. 1166 1164 set_namelist namelist_cfg ln_trainc .true. … … 1193 1191 set_namelist namelist_cfg jpnj 8 1194 1192 set_namelist namelist_cfg jpnij 16 1195 # set_namelist namelist_cfg nn_solv 2 1193 set_namelist namelist_cfg ln_diaobs .true. 1196 1194 set_namelist namelist_cfg ln_t3d .true. 1197 1195 set_namelist namelist_cfg ln_s3d .true. 1198 set_namelist namelist_cfg ln_profb .true.1199 1196 set_namelist namelist_cfg ln_sst .true. 1200 set_namelist namelist_cfg ln_sstfb .true.1201 1197 set_namelist namelist_cfg ln_sla .true. 1202 set_namelist namelist_cfg ln_s lafb.true.1203 set_namelist namelist_cfg ln_ seaice .false.1198 set_namelist namelist_cfg ln_sic .true. 1199 set_namelist namelist_cfg ln_vel3d .true. 1204 1200 set_namelist namelist_cfg ln_bkgwri .true. 1205 1201 set_namelist namelist_cfg ln_trainc .true. -
branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim.cfg
r6060 r6071 1 1 preprocess.prop{fpp.defs} = \ 2 key_trabbl key_lim2 key_d ynspg_flt key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobskey_asminc2 key_trabbl key_lim2 key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc -
branches/2015/dev_merge_2015/NEMOGCM/fcm-make/inc/keys-orca2_lim3.cfg
r6060 r6071 1 1 preprocess.prop{fpp.defs} = \ 2 key_trabbl key_lim3 key_vvl key_d ynspg_ts key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_diaobskey_asminc2 key_trabbl key_lim3 key_vvl key_diaeiv key_ldfslp key_traldf_c2d key_traldf_eiv key_dynldf_c3d key_zdftke key_zdfddm key_zdftmx key_iomput key_mpp_mpi key_asminc
Note: See TracChangeset
for help on using the changeset viewer.
