Changeset 8291
- Timestamp:
- 2017-07-06T11:49:56+02:00 (7 years ago)
- Location:
- branches/2017/dev_r8183_ICEMODEL/NEMOGCM
- Files:
-
- 14 edited
-
CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg (modified) (2 diffs)
-
CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg (modified) (1 diff)
-
CONFIG/ORCA2_SAS_LIM3/EXP00/file_def_nemo.xml (modified) (3 diffs)
-
CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg (modified) (2 diffs)
-
CONFIG/SHARED/field_def_nemo-lim.xml (modified) (1 diff)
-
CONFIG/SHARED/namelist_ref (modified) (2 diffs)
-
CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg (modified) (1 diff)
-
EXTERNAL/AGRIF/LIB/decl.h (modified) (1 diff)
-
NEMO/LIM_SRC_3/ice.F90 (modified) (1 diff)
-
NEMO/LIM_SRC_3/limistate.F90 (modified) (1 diff)
-
NEMO/LIM_SRC_3/limwri.F90 (modified) (4 diffs)
-
NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (1 diff)
-
NEMO/SAS_SRC/sbcssm.F90 (modified) (1 diff)
-
SETTE/BATCH_TEMPLATE/batch-X64_ADA (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/1_namelist_cfg
r7942 r8291 20 20 / 21 21 !----------------------------------------------------------------------- 22 &namzgr ! vertical coordinate23 !-----------------------------------------------------------------------24 ln_zps = .true. ! z-coordinate - partial steps25 /26 !-----------------------------------------------------------------------27 22 &namdom ! space and time domain (bathymetry, mesh, timestep) 28 23 !----------------------------------------------------------------------- 29 ln_linssh = . true. ! =T linear free surface ==>> model level are fixed in time24 ln_linssh = .false. ! =T linear free surface ==>> model level are fixed in time 30 25 nn_closea = 0 ! remove (=0) or keep (=1) closed seas and lakes (ORCA) 31 26 ! … … 176 171 &namdyn_hpg ! Hydrostatic pressure gradient option 177 172 !----------------------------------------------------------------------- 173 ln_hpg_sco = .true. ! s-coordinate (standard jacobian formulation) 178 174 / 179 175 !----------------------------------------------------------------------- -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/ORCA2_LIM3_PISCES/EXP00/namelist_cfg
r7933 r8291 17 17 ! ! (=F) user defined configuration ==>>> see usrdef(_...) modules 18 18 cn_domcfg = "ORCA_R2_zps_domcfg" ! domain configuration filename 19 /20 !-----------------------------------------------------------------------21 &namzgr ! vertical coordinate22 !-----------------------------------------------------------------------23 ln_zps = .true. ! z-coordinate - partial steps24 19 / 25 20 !----------------------------------------------------------------------- -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/file_def_nemo.xml
r7635 r8291 21 21 --> 22 22 23 <file_definition type=" multiple_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4">23 <file_definition type="one_file" name="@expname@_@freq@_@startdate@_@enddate@" sync_freq="10d" min_digits="4"> 24 24 25 <file_group id=" 1ts" output_freq="1ts" output_level="10" enabled=".TRUE."/> <!-- 1 time step files -->25 <file_group id="2ts" output_freq="2ts" output_level="10" enabled=".TRUE."/> <!-- 1 time step files --> 26 26 27 27 <file_group id="1h" output_freq="1h" output_level="10" enabled=".TRUE."/> <!-- 1h files --> … … 39 39 <file_group id="3d" output_freq="3d" output_level="10" enabled=".TRUE."/> <!-- 3d files --> 40 40 41 <file_group id=" 5d" output_freq="5d" output_level="10" enabled=".TRUE."> <!-- 5d files -->41 <file_group id="1ts" output_freq="1ts" output_level="10" enabled=".TRUE."> <!-- 5d files --> 42 42 43 43 <file id="file1" name_suffix="_grid_T" description="ocean T grid variables" > … … 110 110 111 111 <file id="file6" name_suffix="_icemod" description="ice variables" enabled=".true." > 112 <field field_ref="snowthic_cea" name="snthic" />113 <field field_ref="icethic_cea" name="sithic" />114 112 <field field_ref="icevolu" name="sivolu" /> 115 <field field_ref="snowvol" name="snvolu" />116 <field field_ref="iceconc" name="siconc" />117 118 <field field_ref="vfxbog" name="vfxbog" />119 <field field_ref="vfxdyn" name="vfxdyn" />120 <field field_ref="vfxopw" name="vfxopw" />121 <field field_ref="vfxsni" name="vfxsni" />122 <field field_ref="vfxsum" name="vfxsum" />123 <field field_ref="vfxbom" name="vfxbom" />124 <field field_ref="vfxres" name="vfxres" />125 <field field_ref="vfxice" name="vfxice" />126 <field field_ref="vfxsnw" name="vfxsnw" />127 <field field_ref="vfxsub" name="vfxsub" />128 <field field_ref="vfxspr" name="vfxspr" />129 130 <field field_ref="icetrp" name="sivtrp" />131 <field field_ref="snwtrp" name="snvtrp" />132 <field field_ref="saltrp" name="saltrp" />133 <field field_ref="deitrp" name="deitrp" />134 <field field_ref="destrp" name="destrp" />135 136 <field field_ref="sfxbri" name="sfxbri" />137 <field field_ref="sfxdyn" name="sfxdyn" />138 <field field_ref="sfxres" name="sfxres" />139 <field field_ref="sfxbog" name="sfxbog" />140 <field field_ref="sfxbom" name="sfxbom" />141 <field field_ref="sfxsum" name="sfxsum" />142 <field field_ref="sfxsni" name="sfxsni" />143 <field field_ref="sfxopw" name="sfxopw" />144 <field field_ref="sfx" name="sfx" />145 146 <field field_ref="hfxsum" name="hfxsum" />147 <field field_ref="hfxbom" name="hfxbom" />148 <field field_ref="hfxbog" name="hfxbog" />149 <field field_ref="hfxdif" name="hfxdif" />150 <field field_ref="hfxopw" name="hfxopw" />151 <field field_ref="hfxout" name="hfxout" />152 <field field_ref="hfxin" name="hfxin" />153 <field field_ref="hfxsnw" name="hfxsnw" />154 <field field_ref="hfxerr" name="hfxerr" />155 <field field_ref="hfxerr_rem" name="hfxerr_rem" />156 157 <!-- ice-ocean heat flux from mass exchange -->158 <field field_ref="hfxdyn" name="hfxdyn" />159 <field field_ref="hfxres" name="hfxres" />160 <field field_ref="hfxthd" name="hfxthd" />161 <!-- ice-atm. heat flux from mass exchange -->162 <field field_ref="hfxsub" name="hfxsub" />163 <field field_ref="hfxspr" name="hfxspr" />164 165 <!-- diags -->166 <field field_ref="hfxdhc" name="hfxdhc" />167 <field field_ref="hfxtur" name="hfxtur" />168 169 <field field_ref="isst" name="sst" />170 <field field_ref="isss" name="sss" />171 <field field_ref="micesalt" name="sisali" />172 <field field_ref="micet" name="sitemp" />173 <field field_ref="icest" name="sistem" />174 <field field_ref="icehc" name="siheco" />175 <field field_ref="isnowhc" name="snheco" />176 <field field_ref="miceage" name="siages" />177 178 <field field_ref="uice_ipa" name="sivelu" />179 <field field_ref="vice_ipa" name="sivelv" />180 <field field_ref="icevel" name="sivelo" />181 <field field_ref="idive" name="sidive" />182 <field field_ref="ishear" name="sishea" />183 <field field_ref="icestr" name="sistre" />184 185 <field field_ref="ibrinv" name="sibrin" />186 <field field_ref="icecolf" name="sicolf" />187 188 <field field_ref="iceage_cat" name="siagecat" />189 <field field_ref="iceconc_cat" name="siconcat" />190 <field field_ref="icethic_cat" name="sithicat" />191 <field field_ref="snowthic_cat" name="snthicat" />192 <field field_ref="salinity_cat" name="salincat" />193 <field field_ref="brinevol_cat" name="sibricat" />194 <field field_ref="icetemp_cat" name="sitemcat" />195 <field field_ref="snwtemp_cat" name="sntemcat" />196 113 197 114 </file> 198 199 <file id="file7" name_suffix="_scalar" description="scalar variables" enabled=".true." >200 <field field_ref="voltot" name="scvoltot" />201 <field field_ref="sshtot" name="scsshtot" />202 <field field_ref="sshsteric" name="scsshste" />203 <field field_ref="sshthster" name="scsshtst" />204 <field field_ref="masstot" name="scmastot" />205 <field field_ref="temptot" name="sctemtot" />206 <field field_ref="saltot" name="scsaltot" />207 208 <field field_ref="bgtemper" name="bgtemper" />209 <field field_ref="bgsaline" name="bgsaline" />210 <field field_ref="bgheatco" name="bgheatco" />211 <field field_ref="bgsaltco" name="bgsaltco" />212 <field field_ref="bgvolssh" name="bgvolssh" />213 <field field_ref="bgvole3t" name="bgvole3t" />214 <field field_ref="bgfrcvol" name="bgfrcvol" />215 <field field_ref="bgfrctem" name="bgfrctem" />216 <field field_ref="bgfrcsal" name="bgfrcsal" />217 218 <field field_ref="ibgvoltot" name="ibgvoltot" />219 <field field_ref="sbgvoltot" name="sbgvoltot" />220 <field field_ref="ibgarea" name="ibgarea" />221 <field field_ref="ibgsaline" name="ibgsaline" />222 <field field_ref="ibgtemper" name="ibgtemper" />223 <field field_ref="ibgheatco" name="ibgheatco" />224 <field field_ref="sbgheatco" name="sbgheatco" />225 <field field_ref="ibgsaltco" name="ibgsaltco" />226 227 <field field_ref="ibgvfx" name="ibgvfx" />228 <field field_ref="ibgvfxbog" name="ibgvfxbog" />229 <field field_ref="ibgvfxopw" name="ibgvfxopw" />230 <field field_ref="ibgvfxsni" name="ibgvfxsni" />231 <field field_ref="ibgvfxdyn" name="ibgvfxdyn" />232 <field field_ref="ibgvfxbom" name="ibgvfxbom" />233 <field field_ref="ibgvfxsum" name="ibgvfxsum" />234 <field field_ref="ibgvfxres" name="ibgvfxres" />235 <field field_ref="ibgvfxspr" name="ibgvfxspr" />236 <field field_ref="ibgvfxsnw" name="ibgvfxsnw" />237 <field field_ref="ibgvfxsub" name="ibgvfxsub" />238 239 <field field_ref="ibgsfx" name="ibgsfx" />240 <field field_ref="ibgsfxbri" name="ibgsfxbri" />241 <field field_ref="ibgsfxdyn" name="ibgsfxdyn" />242 <field field_ref="ibgsfxres" name="ibgsfxres" />243 <field field_ref="ibgsfxbog" name="ibgsfxbog" />244 <field field_ref="ibgsfxopw" name="ibgsfxopw" />245 <field field_ref="ibgsfxsni" name="ibgsfxsni" />246 <field field_ref="ibgsfxbom" name="ibgsfxbom" />247 <field field_ref="ibgsfxsum" name="ibgsfxsum" />248 249 <field field_ref="ibghfxdhc" name="ibghfxdhc" />250 <field field_ref="ibghfxspr" name="ibghfxspr" />251 252 <field field_ref="ibghfxres" name="ibghfxres" />253 <field field_ref="ibghfxsub" name="ibghfxsub" />254 <field field_ref="ibghfxdyn" name="ibghfxdyn" />255 <field field_ref="ibghfxthd" name="ibghfxthd" />256 <field field_ref="ibghfxsum" name="ibghfxsum" />257 <field field_ref="ibghfxbom" name="ibghfxbom" />258 <field field_ref="ibghfxbog" name="ibghfxbog" />259 <field field_ref="ibghfxdif" name="ibghfxdif" />260 <field field_ref="ibghfxopw" name="ibghfxopw" />261 <field field_ref="ibghfxout" name="ibghfxout" />262 <field field_ref="ibghfxin" name="ibghfxin" />263 <field field_ref="ibghfxsnw" name="ibghfxsnw" />264 265 <field field_ref="ibgfrcvol" name="ibgfrcvol" />266 <field field_ref="ibgfrcsfx" name="ibgfrcsfx" />267 <field field_ref="ibgvolgrm" name="ibgvolgrm" />268 269 </file>270 115 271 116 <!-- -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/ORCA2_SAS_LIM3/EXP00/namelist_cfg
r7404 r8291 19 19 / 20 20 !----------------------------------------------------------------------- 21 &namzgr ! vertical coordinate22 !-----------------------------------------------------------------------23 ln_zps = .true. ! z-coordinate - partial steps24 /25 !-----------------------------------------------------------------------26 21 &namdom ! space and time domain (bathymetry, mesh, timestep) 27 22 !----------------------------------------------------------------------- … … 81 76 &nambbc ! bottom temperature boundary condition (default: NO) 82 77 !----------------------------------------------------------------------- 83 ln_trabbc = .true. ! Apply a geothermal heating at the ocean bottom84 78 / 85 79 !----------------------------------------------------------------------- -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/field_def_nemo-lim.xml
r8289 r8291 232 232 <field id="e3t_m" unit="m" /> 233 233 <field id="frq_m" unit="-" /> 234 235 <!-- specific for rheology --> 236 <field id="isig1" long_name="1st principal stress component for EVP rhg" unit="unitless" /> 237 <field id="isig2" long_name="2nd principal stress component for EVP rhg" unit="unitless" /> 238 <field id="isig3" long_name="convergence measure for EVP rheology (must be =1)" unit="unitless" /> 234 239 235 240 </field_group> -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/SHARED/namelist_ref
r8268 r8291 313 313 ! ! ! (if <0 months) ! name ! (logical) ! (T/F) ! 'monthly' ! filename ! pairing ! filename ! 314 314 l_sasread = .TRUE. ! Read fields in a file if .TRUE. , or initialize to 0. in sbcssm.F90 if .FALSE. 315 sn_usp = 'sas_grid_U', 120 , 'vozocrtx', .true. , .true. , 'yearly' , '' , '' , ''316 sn_vsp = 'sas_grid_V', 120 , 'vomecrty', .true. , .true. , 'yearly' , '' , '' , ''315 sn_usp = 'sas_grid_U', 120 , 'uos' , .true. , .true. , 'yearly' , '' , '' , '' 316 sn_vsp = 'sas_grid_V', 120 , 'vos' , .true. , .true. , 'yearly' , '' , '' , '' 317 317 sn_tem = 'sas_grid_T', 120 , 'sosstsst', .true. , .true. , 'yearly' , '' , '' , '' 318 318 sn_sal = 'sas_grid_T', 120 , 'sosaline', .true. , .true. , 'yearly' , '' , '' , '' … … 321 321 sn_frq = 'sas_grid_T', 120 , 'frq_m' , .true. , .true. , 'yearly' , '' , '' , '' 322 322 323 ln_3d_uve = . true.! specify whether we are supplying a 3D u,v and e3 field323 ln_3d_uve = .false. ! specify whether we are supplying a 3D u,v and e3 field 324 324 ln_read_frq = .false. ! specify whether we must read frq or not 325 325 cn_dir = './' ! root directory for the location of the bulk files are -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/CONFIG/TEST_CASES/SAS_BIPER/EXP00/namelist_cfg
r7822 r8291 26 26 &namdom ! space and time domain (bathymetry, mesh, timestep) 27 27 !----------------------------------------------------------------------- 28 ln_linssh = . false. ! =T linear free surface ==>> model level are fixed in time28 ln_linssh = .true. ! =T linear free surface ==>> model level are fixed in time 29 29 ! 30 30 nn_msh = 1 ! create (>0) a mesh file or not (=0) -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/EXTERNAL/AGRIF/LIB/decl.h
r5656 r8291 36 36 #define LONG_FNAME 1000 // Max length for a file name 37 37 #define LONG_C 200 38 #define LONG_M 150038 #define LONG_M 2500 39 39 40 40 #define NB_CAT_VARIABLES 5 -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90
r8240 r8291 640 640 diag_intstrx(jpi,jpj) , diag_intstry(jpi,jpj) , & 641 641 diag_sig1(jpi,jpj) , diag_sig2(jpi,jpj) , & 642 STAT = ierr(ii) )642 diag_shear(jpi,jpj) , STAT = ierr(ii) ) 643 643 644 644 ice_alloc = MAXVAL( ierr(:) ) -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90
r8239 r8291 531 531 INTEGER :: ifpr, ierror 532 532 ! 533 CHARACTER(len= 100) :: cn_dir ! Root directory for location of ice files533 CHARACTER(len=256) :: cn_dir ! Root directory for location of ice files 534 534 TYPE(FLD_N) :: sn_hti, sn_hts, sn_ati, sn_tsu, sn_tmi, sn_smi 535 535 TYPE(FLD_N), DIMENSION(jpfldi) :: slf_i ! array of namelist informations on the fields to read -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limwri.F90
r8289 r8291 54 54 INTEGER :: ji, jj, jk, jl ! dummy loop indices 55 55 REAL(wp) :: z2da, z2db, ztmp, zrho1, zrho2, zmiss_val 56 REAL(wp) :: zs12, zshear 56 57 REAL(wp), POINTER, DIMENSION(:,:,:) :: zswi2, zmiss2 57 58 REAL(wp), POINTER, DIMENSION(:,:) :: z2d, zswi, zmiss ! 2D workspace 58 59 REAL(wp), POINTER, DIMENSION(:,:) :: zfb ! ice freeboard 59 60 REAL(wp), POINTER, DIMENSION(:,:) :: zamask, zamask15 ! 15% concentration mask 61 REAL(wp), POINTER, DIMENSION(:,:) :: zsig1, zsig2, zsig3 60 62 61 63 ! Global ice diagnostics (SIMIP) … … 71 73 IF( nn_timing == 1 ) CALL timing_start('limwri') 72 74 73 CALL wrk_alloc( jpi, jpj, jpl, zswi2, zmiss2 ) 74 CALL wrk_alloc( jpi, jpj , z2d, zswi, zmiss ) 75 CALL wrk_alloc( jpi, jpj , zfb, zamask, zamask15 ) 75 CALL wrk_alloc( jpi,jpj, jpl, zswi2, zmiss2 ) 76 CALL wrk_alloc( jpi,jpj , z2d, zswi, zmiss ) 77 CALL wrk_alloc( jpi,jpj , zfb, zamask, zamask15 ) 78 CALL wrk_alloc( jpi,jpj , zsig1, zsig2, zsig3 ) 76 79 77 80 !---------------------------------------- … … 226 229 CALL iom_put ('hfxspr' , hfx_spr(:,:) ) ! Heat content of snow precip 227 230 231 ! specific outputs for EVP rheology 232 IF( iom_use( "isig1" ) .OR. iom_use( "isig2" ) .OR. iom_use( "isig3" ) ) THEN 233 zsig1(:,:) = 0._wp; zsig2(:,:) = 0._wp; zsig3(:,:) = 0._wp; 234 DO jj = 2, jpjm1 235 DO ji = 2, jpim1 236 zs12 = ( zswi(ji-1,jj) * stress12_i(ji-1,jj) + zswi(ji ,jj-1) * stress12_i(ji ,jj-1) + & ! stress12_i at T-point 237 & zswi(ji ,jj) * stress12_i(ji ,jj) + zswi(ji-1,jj-1) * stress12_i(ji-1,jj-1) ) & 238 & / MAX( 1._wp, zswi(ji-1,jj) + zswi(ji,jj-1) + zswi(ji,jj) + zswi(ji-1,jj-1) ) 239 240 zshear = SQRT( stress2_i(ji,jj) * stress2_i(ji,jj) + 4._wp * zs12 * zs12 ) ! shear stress 241 242 z2da = zswi(ji,jj) / MAX( 1._wp, strength(ji,jj) ) 243 244 !! zsig1(ji,jj) = 0.5_wp * z2da * ( stress1_i(ji,jj) + zshear ) ! principal stress (y-direction, see Hunke & Dukowicz 2002) 245 !! zsig2(ji,jj) = 0.5_wp * z2da * ( stress1_i(ji,jj) - zshear ) ! principal stress (x-direction, see Hunke & Dukowicz 2002) 246 !! zsig3(ji,jj) = z2da**2 * ( ( stress1_i(ji,jj) + strength(ji,jj) )**2 + ( rn_ecc * zshear )**2 ) ! quadratic relation linking compressive stress to shear stress 247 !! ! (scheme converges if this value is ~1, see Bouillon et al 2009 (eq. 11)) 248 zsig1(ji,jj) = 0.5_wp * z2da * ( stress1_i(ji,jj) ) ! compressive stress, see Bouillon et al. 2015 249 zsig2(ji,jj) = 0.5_wp * z2da * ( zshear ) ! shear stress 250 zsig3(ji,jj) = z2da**2 * ( ( stress1_i(ji,jj) + strength(ji,jj) )**2 + ( rn_ecc * zshear )**2 ) 251 END DO 252 END DO 253 CALL lbc_lnk_multi( zsig1, 'T', 1., zsig2, 'T', 1., zsig3, 'T', 1. ) 254 CALL iom_put( "isig1" , zsig1 ) 255 CALL iom_put( "isig2" , zsig2 ) 256 CALL iom_put( "isig3" , zsig3 ) 257 ENDIF 258 228 259 ! MV MP 2016 229 260 IF ( ln_pnd ) THEN … … 400 431 CALL wrk_dealloc( jpi, jpj , z2d, zswi, zmiss ) 401 432 CALL wrk_dealloc( jpi, jpj , zfb, zamask, zamask15 ) 433 CALL wrk_dealloc( jpi, jpj , zsig1, zsig2, zsig3 ) 402 434 403 435 IF( nn_timing == 1 ) CALL timing_stop('limwri') -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_lim.F90
r8239 r8291 179 179 u_ice(:,:) = rn_uice * umask(:,:,1) ! or prescribed velocity 180 180 v_ice(:,:) = rn_vice * vmask(:,:,1) 181 !!CALL RANDOM_NUMBER(u_ice(:,:)) 182 !!CALL RANDOM_NUMBER(v_ice(:,:)) 181 183 ENDIF 182 184 CALL lim_trp( kt ) ! -- Ice transport (Advection/diffusion) -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/SAS_SRC/sbcssm.F90
r7761 r8291 115 115 ELSE 116 116 sst_m(:,:) = 0._wp 117 sss_m(:,:) = 0._wp117 sss_m(:,:) = 35._wp 118 118 ssu_m(:,:) = 0._wp 119 119 ssv_m(:,:) = 0._wp -
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA
r7715 r8291 11 11 # @ total_tasks = NPROCS 12 12 # time 13 # @ wall_clock_limit = 1:30:0013 # @ wall_clock_limit = 00:59:00 14 14 # @ queue 15 15
Note: See TracChangeset
for help on using the changeset viewer.
