Changeset 4233
- Timestamp:
- 2013-11-18T13:14:32+01:00 (11 years ago)
- Location:
- branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM
- Files:
-
- 16 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/ARCH/arch-ALTIX_NAUTILUS_MPT.fcm
r4229 r4233 47 47 %LD ifort 48 48 %FPPFLAGS -P -C -traditional 49 %LDFLAGS -lmpi -lstdc++ 49 %LDFLAGS -lmpi -lstdc++ -lcurl 50 50 %AR ar 51 51 %ARFLAGS -r -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/AMM12/EXP00/namelist
r4229 r4233 553 553 ln_traadv_qck = .false. ! QUICKEST scheme 554 554 ln_traadv_msc_ups= .false. ! use upstream scheme within muscl 555 / 556 !----------------------------------------------------------------------- 557 &namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param) 558 !----------------------------------------------------------------------- 559 ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation 560 rn_ce = 0.06 ! magnitude of the MLE (typical value: 0.06 to 0.08) 561 nn_mle = 1 ! MLE type: =0 standard Fox-Kemper ; =1 new formulation 562 rn_lf = 5.e+3 ! typical scale of mixed layer front (meters) (case rn_mle=0) 563 rn_time = 172800. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_mle=0) 564 rn_lat = 20. ! reference latitude (degrees) of MLE coef. (case rn_mle=1) 565 nn_mld_uv = 0 ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max) 566 nn_conv = 0 ! =1 no MLE in case of convection ; =0 always MLE 567 rn_rho_c_mle = 0.01 ! delta rho criterion used to calculate MLD for FK 555 568 / 556 569 !---------------------------------------------------------------------------------- -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml
r3983 r4233 47 47 <field field_ref="mldr10_1" name="somxl010" /> 48 48 <field field_ref="mldkz5" name="somixhgt" /> 49 </file> 49 <!-- variables available with MLE 50 <field field_ref="Lf_NHpf" name="Lf_NHpf" long_name="MLE:_Lf=NH/f" /> 51 --> 52 </file> 50 53 51 54 <file id="file2" name_suffix="_grid_U" description="ocean U grid variables" > 52 55 <field field_ref="uoce" name="vozocrtx" /> 53 56 <field field_ref="utau" name="sozotaux" /> 57 <!-- variables available with MLE 58 <field field_ref="psiu_mle" name="psiu_mle" long_name="MLE_streamfunction_along_i-axis" /> 59 --> 54 60 </file> 55 61 … … 57 63 <field field_ref="voce" name="vomecrty" /> 58 64 <field field_ref="vtau" name="sometauy" /> 65 <!-- variables available with MLE 66 <field field_ref="psiv_mle" name="psiv_mle" long_name="MLE_streamfunction_along_j-axis" /> 67 --> 59 68 </file> 60 69 -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE/EXP00/namelist
r4229 r4233 589 589 ln_traadv_qck = .false. ! QUICKEST scheme 590 590 ln_traadv_msc_ups= .false. ! use upstream scheme within muscl 591 / 592 !----------------------------------------------------------------------- 593 &namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param) 594 !----------------------------------------------------------------------- 595 ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation 596 rn_ce = 0.06 ! magnitude of the MLE (typical value: 0.06 to 0.08) 597 nn_mle = 1 ! MLE type: =0 standard Fox-Kemper ; =1 new formulation 598 rn_lf = 5.e+3 ! typical scale of mixed layer front (meters) (case rn_mle=0) 599 rn_time = 172800. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_mle=0) 600 rn_lat = 20. ! reference latitude (degrees) of MLE coef. (case rn_mle=1) 601 nn_mld_uv = 0 ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max) 602 nn_conv = 0 ! =1 no MLE in case of convection ; =0 always MLE 603 rn_rho_c_mle = 0.01 ! delta rho criterion used to calculate MLD for FK 591 604 / 592 605 !---------------------------------------------------------------------------------- -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE_BFM/EXP00/namelist
r4229 r4233 589 589 ln_traadv_qck = .false. ! QUICKEST scheme 590 590 ln_traadv_msc_ups= .false. ! use upstream scheme within muscl 591 / 592 !----------------------------------------------------------------------- 593 &namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param) 594 !----------------------------------------------------------------------- 595 ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation 596 rn_ce = 0.06 ! magnitude of the MLE (typical value: 0.06 to 0.08) 597 nn_mle = 1 ! MLE type: =0 standard Fox-Kemper ; =1 new formulation 598 rn_lf = 5.e+3 ! typical scale of mixed layer front (meters) (case rn_mle=0) 599 rn_time = 172800. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_mle=0) 600 rn_lat = 20. ! reference latitude (degrees) of MLE coef. (case rn_mle=1) 601 nn_mld_uv = 0 ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max) 602 nn_conv = 0 ! =1 no MLE in case of convection ; =0 always MLE 603 rn_rho_c_mle = 0.01 ! delta rho criterion used to calculate MLD for FK 591 604 / 592 605 !---------------------------------------------------------------------------------- -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml
r3983 r4233 47 47 <field field_ref="mldr10_1" name="somxl010" /> 48 48 <field field_ref="mldkz5" name="somixhgt" /> 49 <!-- variables available with MLE 50 <field field_ref="Lf_NHpf" name="Lf_NHpf" long_name="MLE:_Lf=NH/f" /> 51 --> 49 52 </file> 50 53 … … 52 55 <field field_ref="uoce" name="vozocrtx" /> 53 56 <field field_ref="utau" name="sozotaux" /> 57 <!-- variables available with MLE 58 <field field_ref="psiu_mle" name="psiu_mle" long_name="MLE_streamfunction_along_i-axis" /> 59 --> 54 60 </file> 55 61 … … 57 63 <field field_ref="voce" name="vomecrty" /> 58 64 <field field_ref="vtau" name="sometauy" /> 65 <!-- variables available with MLE 66 <field field_ref="psiv_mle" name="psiv_mle" long_name="MLE_streamfunction_along_j-axis" /> 67 --> 59 68 </file> 60 69 -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml
r3983 r4233 67 67 <field field_ref="mldkz5" /> 68 68 <field field_ref="mldr10_1" /> 69 <!-- variables available with MLE 70 <field field_ref="Lf_NHpf" name="Lf_NHpf" long_name="MLE:_Lf=NH/f" /> 71 --> 69 72 </file> 70 73 … … 73 76 <field field_ref="suoce" name="uos" long_name="sea_surface_x_velocity" /> 74 77 <field field_ref="utau" name="tauuo" long_name="surface_downward_x_stress" /> 78 <!-- variables available with MLE 79 <field field_ref="psiu_mle" name="psiu_mle" long_name="MLE_streamfunction_along_i-axis" /> 80 --> 75 81 </file> 76 82 … … 79 85 <field field_ref="svoce" name="vos" long_name="sea_surface_y_velocity" /> 80 86 <field field_ref="vtau" name="tauvo" long_name="surface_downward_y_stress" /> 87 <!-- variables available with MLE 88 <field field_ref="psiv_mle" name="psiv_mle" long_name="MLE_streamfunction_along_j-axis" /> 89 --> 81 90 </file> 82 91 -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
r4229 r4233 584 584 ln_traadv_qck = .false. ! QUICKEST scheme 585 585 ln_traadv_msc_ups= .false. ! use upstream scheme within muscl 586 / 587 !----------------------------------------------------------------------- 588 &namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param) 589 !----------------------------------------------------------------------- 590 ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation 591 rn_ce = 0.06 ! magnitude of the MLE (typical value: 0.06 to 0.08) 592 nn_mle = 1 ! MLE type: =0 standard Fox-Kemper ; =1 new formulation 593 rn_lf = 5.e+3 ! typical scale of mixed layer front (meters) (case rn_mle=0) 594 rn_time = 172800. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_mle=0) 595 rn_lat = 20. ! reference latitude (degrees) of MLE coef. (case rn_mle=1) 596 nn_mld_uv = 0 ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max) 597 nn_conv = 0 ! =1 no MLE in case of convection ; =0 always MLE 598 rn_rho_c_mle = 0.01 ! delta rho criterion used to calculate MLD for FK 586 599 / 587 600 !---------------------------------------------------------------------------------- -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml
r3984 r4233 66 66 <field field_ref="erp" name="sowafldp" /> 67 67 <field field_ref="ist_ipa" name="soicetem" /> 68 <field field_ref="icealb_cea" name="soicealb" /> 68 <field field_ref="icealb_cea" name="soicealb" /> 69 <!-- variables available with MLE 70 <field field_ref="Lf_NHpf" name="Lf_NHpf" long_name="MLE:_Lf=NH/f" /> 71 --> 69 72 </file> 70 73 … … 73 76 <field field_ref="uoce_eiv" name="vozoeivu" /> 74 77 <field field_ref="utau" name="sozotaux" /> 78 <!-- variables available with MLE 79 <field field_ref="psiu_mle" name="psiu_mle" long_name="MLE_streamfunction_along_i-axis" /> 80 --> 75 81 </file> 76 82 … … 79 85 <field field_ref="voce_eiv" name="vomeeivv" /> 80 86 <field field_ref="vtau" name="sometauy" /> 87 <!-- variables available with MLE 88 <field field_ref="psiv_mle" name="psiv_mle" long_name="MLE_streamfunction_along_j-axis" /> 89 --> 81 90 </file> 82 91 -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
r4229 r4233 565 565 ln_traadv_qck = .false. ! QUICKEST scheme 566 566 ln_traadv_msc_ups= .false. ! use upstream scheme within muscl 567 / 568 !----------------------------------------------------------------------- 569 &namtra_adv_mle ! mixed layer eddy parametrisation (Fox-Kemper param) 570 !----------------------------------------------------------------------- 571 ln_mle = .true. ! (T) use the Mixed Layer Eddy (MLE) parameterisation 572 rn_ce = 0.06 ! magnitude of the MLE (typical value: 0.06 to 0.08) 573 nn_mle = 1 ! MLE type: =0 standard Fox-Kemper ; =1 new formulation 574 rn_lf = 5.e+3 ! typical scale of mixed layer front (meters) (case rn_mle=0) 575 rn_time = 172800. ! time scale for mixing momentum across the mixed layer (seconds) (case rn_mle=0) 576 rn_lat = 20. ! reference latitude (degrees) of MLE coef. (case rn_mle=1) 577 nn_mld_uv = 0 ! space interpolation of MLD at u- & v-pts (0=min,1=averaged,2=max) 578 nn_conv = 0 ! =1 no MLE in case of convection ; =0 always MLE 579 rn_rho_c_mle = 0.01 ! delta rho criterion used to calculate MLD for FK 567 580 / 568 581 !----------------------------------------------------------------------- -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/CONFIG/SHARED/field_def.xml
r3983 r4233 29 29 <field id="mldr10_1" long_name="Mixed Layer Depth 0.01 ref.10m" unit="m" /> 30 30 <field id="rhop" long_name="potential density (sigma0)" unit="kg/m3" grid_ref="grid_T_3D"/> 31 <!-- variables available with MLE --> 32 <field id="Lf_NHpf" long_name="MLE: Lf = N H / f" unit="m" /> 31 33 <!-- next variables available with key_diahth --> 32 34 <field id="mlddzt" long_name="Thermocline Depth (max dT/dz)" unit="m" /> … … 140 142 <field id="uoce" long_name="ocean current along i-axis" unit="m/s" grid_ref="grid_U_3D" /> 141 143 <field id="uocetr_eff" long_name="Effective ocean transport along i-axis" unit="m3/s" grid_ref="grid_U_3D" /> 144 <!-- variables available with MLE --> 145 <field id="psiu_mle" long_name="MLE streamfunction along i-axis" unit="m3/s" grid_ref="grid_U_3D" /> 142 146 <!-- uoce_eiv: available with key_traldf_eiv and key_diaeiv --> 143 147 <field id="uoce_eiv" long_name="EIV ocean current along i-axis" unit="m/s" grid_ref="grid_U_3D" /> … … 159 163 <field id="voce" long_name="ocean current along j-axis" unit="m/s" grid_ref="grid_V_3D" /> 160 164 <field id="vocetr_eff" long_name="Effective ocean transport along j-axis" unit="m3/s" grid_ref="grid_V_3D" /> 165 <!-- variables available with MLE --> 166 <field id="psiv_mle" long_name="MLE streamfunction along j-axis" unit="m3/s" grid_ref="grid_V_3D" /> 161 167 <!-- voce_eiv: available with key_traldf_eiv and key_diaeiv --> 162 168 <field id="voce_eiv" long_name="EIV ocean current along j-axis" unit="m/s" grid_ref="grid_V_3D" /> -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/TRA/traadv.F90
r3718 r4233 6 6 !! History : 2.0 ! 2005-11 (G. Madec) Original code 7 7 !! 3.3 ! 2010-09 (C. Ethe, G. Madec) merge TRC-TRA + switch from velocity to transport 8 !! 4.0 ! 2011-06 (G. Madec) Addition of Mixed Layer Eddy parameterisation 8 9 !!---------------------------------------------------------------------- 9 10 … … 21 22 USE traadv_qck ! QUICKEST scheme (tra_adv_qck routine) 22 23 USE traadv_eiv ! eddy induced velocity (tra_adv_eiv routine) 24 USE traadv_mle ! ML eddy induced velocity (tra_adv_mle routine) 23 25 USE cla ! cross land advection (cla_traadv routine) 24 26 USE ldftra_oce ! lateral diffusion coefficient on tracers … … 99 101 & CALL tra_adv_eiv( kt, nit000, zun, zvn, zwn, 'TRA' ) ! add the eiv transport (if necessary) 100 102 ! 103 IF( ln_mle ) CALL tra_adv_mle( kt, nit000, zun, zvn, zwn, 'TRA' ) ! add the mle transport (if necessary) 101 104 CALL iom_put( "uocetr_eff", zun ) ! output effective transport 102 105 CALL iom_put( "vocetr_eff", zvn ) … … 136 139 & tab3d_2=tsa(:,:,:,jp_sal), clinfo2= ' Sa: ', mask2=tmask, clinfo3='tra' ) 137 140 ! 138 IF( nn_timing == 1 ) CALL timing_stop( 'tra_adv')141 IF( nn_timing == 1 ) CALL timing_stop( 'tra_adv' ) 139 142 ! 140 143 CALL wrk_dealloc( jpi, jpj, jpk, zun, zvn, zwn ) … … 206 209 ENDIF 207 210 ! 211 CALL tra_adv_mle_init ! initialisation of the Mixed Layer Eddy parametrisation (MLE) 212 ! 208 213 END SUBROUTINE tra_adv_init 209 214 -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
r3294 r4233 24 24 25 25 PUBLIC zdf_mxl ! called by step.F90 26 27 REAL(wp), PUBLIC :: rho_c = 0.01_wp ! density criterion for mixed layer depth 28 REAL(wp), PUBLIC :: avt_c = 5.e-4_wp ! Kz criterion for the turbocline depth 26 29 27 30 INTEGER , PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) :: nmln !: number of level in the mixed layer (used by TOP) … … 63 66 !! ** Method : The mixed layer depth is the shallowest W depth with 64 67 !! the density of the corresponding T point (just bellow) bellow a 65 !! given value defined locally as rho(10m) + zrho_c68 !! given value defined locally as rho(10m) + rho_c 66 69 !! The turbocline depth is the depth at which the vertical 67 70 !! eddy diffusivity coefficient (resulting from the vertical physics … … 76 79 INTEGER :: iikn, iiki ! temporary integer within a do loop 77 80 INTEGER, POINTER, DIMENSION(:,:) :: imld ! temporary workspace 78 REAL(wp) :: zrho_c = 0.01_wp ! density criterion for mixed layer depth79 REAL(wp) :: zavt_c = 5.e-4_wp ! Kz criterion for the turbocline depth80 81 !!---------------------------------------------------------------------- 81 82 ! … … 98 99 DO jj = 1, jpj 99 100 DO ji = 1, jpi 100 IF( rhop(ji,jj,jk) > rhop(ji,jj,nla10) + zrho_c ) nmln(ji,jj) = jk ! Mixed layer101 IF( avt (ji,jj,jk) < zavt_c ) imld(ji,jj) = jk ! Turbocline101 IF( rhop(ji,jj,jk) > rhop(ji,jj,nla10) + rho_c ) nmln(ji,jj) = jk ! Mixed layer 102 IF( avt (ji,jj,jk) < avt_c ) imld(ji,jj) = jk ! Turbocline 102 103 END DO 103 104 END DO -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/SETTE/all_functions.sh
r3294 r4233 96 96 if [ ${#} -lt ${minargcount} ] 97 97 then 98 echo "not enough targuments for set_namelist"98 echo "not enough arguments for set_namelist" 99 99 echo "${usage}" 100 100 exit 1 … … 113 113 echo "doing \"set_namelist $@\". " 114 114 echo "variable: \"$2\" is empty" 115 echo "con trolthat variable $2 is in \"${EXE_DIR}/$1\" "115 echo "confirm that variable $2 is in \"${EXE_DIR}/$1\" " 116 116 echo "exit" 117 117 echo "error in executing script : set_namelist $@" >> ${SETTE_DIR}/output.sette … … 128 128 echo " " >> ${SETTE_DIR}/output.sette 129 129 } 130 130 131 131 132 # function to tidy up after each test and populate the NEMO_VALIDATION store … … 216 217 fi 217 218 } 219 220 ############################################################# 221 # extra functions to manipulate settings in the iodef.xml file 222 # 223 # Examples: 224 # set_xio_file_type iodef.xml one_file 225 # set_xio_using_server iodef.xml true 226 # set_xio_buffer_size iodef.xml 50000000 227 # 228 ############################################################# 229 230 usage2=" Usage : set_xio_file_type input_iodef.xml one_file||multiple_file" 231 usage3=" Usage : set_xio_using_server input_iodef.xml true||false" 232 usage4=" Usage : set_xio_buffer_size input_iodef.xml int_buffer_size" 233 234 set_xio_file_type () { 235 minargcount=2 236 if [ ${#} -lt ${minargcount} ] 237 then 238 echo "not enough arguments for set_xio_file_type" 239 echo "${usage2}" 240 exit 1 241 fi 242 if [ $2 != "one_file" ] && [ $2 != "multiple_file" ] 243 then 244 echo "unrecognised argument for set_xio_file_type" 245 echo "${usage2}" 246 echo $2 247 exit 1 248 fi 249 unset minargcount 250 if [ ! -f ${SETTE_DIR}/output.sette ] ; then 251 touch ${SETTE_DIR}/output.sette 252 fi 253 254 echo "executing script : set_xio_file_type $@" >> ${SETTE_DIR}/output.sette 255 echo "################" >> ${SETTE_DIR}/output.sette 256 257 VAR_NAME=$( grep "^.*<.*file_definition.*type.*=" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 258 if [ ${#VAR_NAME} -eq 0 ] 259 then 260 echo "doing \"set_xio_file_type $@\". " 261 echo "xml_tag: file_definition with variable: type is empty" 262 echo "confirm that an appropriate file_definition is in \"${EXE_DIR}/$1\" " 263 echo "exit" 264 echo "error in executing script : set_xio_file_type $@" >> ${SETTE_DIR}/output.sette 265 echo "....." >> ${SETTE_DIR}/output.sette 266 exit 1 267 fi 268 if [ $2 == "one_file" ] 269 then 270 sed -e "s:multiple_file:one_file:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 271 else 272 sed -e "s:one_file:multiple_file:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 273 fi 274 mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 275 276 echo "finished script : set_xio_file_type $@" >> ${SETTE_DIR}/output.sette 277 echo "++++++++++++++++" >> ${SETTE_DIR}/output.sette 278 echo " " >> ${SETTE_DIR}/output.sette 279 } 280 281 set_xio_using_server () { 282 minargcount=2 283 if [ ${#} -lt ${minargcount} ] 284 then 285 echo "not enough arguments for set_xio_using_server" 286 echo "${usage2}" 287 exit 1 288 fi 289 if [ $2 != "true" ] && [ $2 != "false" ] 290 then 291 echo "unrecognised argument for set_xio_using_server" 292 echo "${usage2}" 293 echo $2 294 exit 1 295 fi 296 unset minargcount 297 if [ ! -f ${SETTE_DIR}/output.sette ] ; then 298 touch ${SETTE_DIR}/output.sette 299 fi 300 301 echo "executing script : set_xio_using_server $@" >> ${SETTE_DIR}/output.sette 302 echo "################" >> ${SETTE_DIR}/output.sette 303 304 VAR_NAME=$( grep "^.*<.*variable id.*=.*using_server.*=.*boolean" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 305 if [ ${#VAR_NAME} -eq 0 ] 306 then 307 echo "doing \"set_xio_using_server $@\". " 308 echo "xml_tag: "variable id=using_server" with variable: boolean is empty" 309 echo "confirm that an appropriate variable id is in \"${EXE_DIR}/$1\" " 310 echo "exit" 311 echo "error in executing script : set_xio_using_server $@" >> ${SETTE_DIR}/output.sette 312 echo "....." >> ${SETTE_DIR}/output.sette 313 exit 1 314 fi 315 if [ $2 == "false" ] 316 then 317 sed -e "/using_server/s:true:false:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 318 export USING_MPMD=no 319 else 320 sed -e "/using_server/s:false:true:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 321 export USING_MPMD=yes 322 fi 323 mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 324 325 echo "finished script : set_xio_using_server $@" >> ${SETTE_DIR}/output.sette 326 echo "++++++++++++++++" >> ${SETTE_DIR}/output.sette 327 echo " " >> ${SETTE_DIR}/output.sette 328 } 329 330 set_xio_buffer_size () { 331 minargcount=2 332 if [ ${#} -lt ${minargcount} ] 333 then 334 echo "not enough arguments for set_xio_buffer_size" 335 echo "${usage4}" 336 exit 1 337 fi 338 unset minargcount 339 if [ ! -f ${SETTE_DIR}/output.sette ] ; then 340 touch ${SETTE_DIR}/output.sette 341 fi 342 343 echo "executing script : set_xio_buffer_size $@" >> ${SETTE_DIR}/output.sette 344 echo "################" >> ${SETTE_DIR}/output.sette 345 346 VAR_NAME=$( grep "^.*<.*variable id.*=.*buffer_size.*=.*integer" ${EXE_DIR}/$1 | sed -e "s% *\!.*%%" ) 347 if [ ${#VAR_NAME} -eq 0 ] 348 then 349 echo "doing \"set_xio_buffer_size $@\". " 350 echo "xml_tag: "variable id=buffer_size" with variable: integer is empty" 351 echo "confirm that an appropriate variable id is in \"${EXE_DIR}/$1\" " 352 echo "exit" 353 echo "error in executing script : set_xio_buffer_size $@" >> ${SETTE_DIR}/output.sette 354 echo "....." >> ${SETTE_DIR}/output.sette 355 exit 1 356 fi 357 sed -e "/buffer_size/s:>.*<:>$2<:" ${EXE_DIR}/$1 > ${EXE_DIR}/$1.tmp 358 mv ${EXE_DIR}/$1.tmp ${EXE_DIR}/$1 359 360 echo "finished script : set_xio_buffer_size $@" >> ${SETTE_DIR}/output.sette 361 echo "++++++++++++++++" >> ${SETTE_DIR}/output.sette 362 echo " " >> ${SETTE_DIR}/output.sette 363 } 364 -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/SETTE/prepare_job.sh
r3680 r4233 68 68 # 69 69 70 usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE "71 usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE "72 73 74 minargcount= 570 usage=" Usage : ./prepare_job.sh INPUT_FILE_CONFIG_NAME NUMBER_PROC TEST_NAME MPI_FLAG JOB_FILE NUM_XIO_SERVERS" 71 usage=" example : ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg 8 SHORT no/yes $JOB_FILE 0" 72 73 74 minargcount=6 75 75 if [ ${#} -lt ${minargcount} ] 76 76 then … … 93 93 MPI_FLAG=$4 94 94 JOB_FILE=$5 95 NXIO_PROC=$6 95 96 96 97 # export EXE_DIR. This directory is used to execute model … … 185 186 case ${COMPILER} in 186 187 ALTIX_NAUTILUS_MPT) 187 NB_REM=$( echo $NB_PROC | awk '{print $1% 4}')188 NB_REM=$( echo $NB_PROC $NXIO_PROC | awk '{print ( $1 + $2 ) % 4}') 188 189 if [ ${NB_REM} == 0 ] ; then 189 190 # number of processes required is an integer multiple of 4 190 191 # 191 NB_NODES=$( echo $NB_PROC | awk '{print $1/ 4}')192 NB_NODES=$( echo $NB_PROC $NXIO_PROC | awk '{print ($1 + $2 ) / 4}') 192 193 else 193 194 # … … 195 196 # round up the number of nodes required. 196 197 # 197 NB_NODES=$( echo $NB_PROC | awk '{printf("%d",$1/ 4 + 1 )}')198 NB_NODES=$( echo $NB_PROC $NXIO_PROC | awk '{printf("%d",($1 + $2 ) / 4 + 1 )}') 198 199 fi 199 200 ;; … … 229 230 # Pass settings into job file by using sed to edit predefined strings 230 231 # 231 cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" -e"s/NPROCS/${NB_PROC}/" \ 232 cat ${SETTE_DIR}/job_batch_template | sed -e"s/NODES/${NB_NODES}/" \ 233 -e"s/NPROCS/${NB_PROC}/" \ 234 -e"s/NXIOPROCS/${NXIO_PROC}/" \ 232 235 -e"s:DEF_SETTE_DIR:${SETTE_DIR}:" -e"s:DEF_INPUT_DIR:${INPUT_DIR}:" \ 233 236 -e"s:DEF_EXE_DIR:${EXE_DIR}:" \ -
branches/2013/dev_MERCATOR_UKMO_2013/NEMOGCM/SETTE/sette.sh
r3708 r4233 2 2 ############################################################ 3 3 # Author : Simona Flavoni for NEMO 4 # Contact : sflod@locean-ipsl.upmc.fr 4 # Contact: sflod@locean-ipsl.upmc.fr 5 # 2013 : A.C. Coward added options for testing with XIOS in dettached mode 5 6 # 6 7 # sette.sh : principal script of SET TEsts for NEMO (SETTE) … … 15 16 #set -u 16 17 #set -e 17 #+ 18 # 19 # ================ 20 # sette.sh 21 # ================ 22 # 23 # ---------------------------------------------- 24 # Set of tests for NEMO 25 # ---------------------------------------------- 26 # 27 # SYNOPSIS 28 # ======== 29 # 30 # :: 31 # 32 # $ ./sette.sh 33 # 18 # =========== 34 19 # DESCRIPTION 35 20 # =========== … … 37 22 # Variables to be checked by user: 38 23 # 39 # COMPILER : name of compiler as defined in NEMOGCM/ARCH directory 40 # 41 # BATCH_COMMAND : name of the command for batch submission 42 # 43 # INTERACT_FLAG : flag to run in interactive mode "yes" 44 # to run in batch mode "no" 45 # 46 # MPIRUN_FLAG : flag to run in parallel (MPI) "yes" 47 # to run in sequential mode (NB_PROC = 1) "no" 24 # COMPILER : name of compiler as defined in NEMOGCM/ARCH directory 25 # BATCH_COMMAND_PAR : name of the command for submitting parallel batch jobs 26 # BATCH_COMMAND_SEQ : name of the command for submitting sequential batch jobs 27 # INTERACT_FLAG : flag to run in interactive mode "yes" 28 # to run in batch mode "no" 29 # MPIRUN_FLAG : flag to run in parallel (MPI) "yes" 30 # to run in sequential mode (NB_PROC = 1) "no" 31 # USING_XIOS : flag to control the activation of key_iomput 32 # "yes" to compile using key_iomput and link to the external XIOS library 33 # "no" to compile without key_iomput and link to the old IOIPSL library 34 # USING_MPMD : flag to control the use of stand-alone IO servers 35 # requires USING_XIOS="yes" 36 # "yes" to run in MPMD (detached) mode with stand-alone IO servers 37 # "no" to run in SPMD (attached) mode without separate IO servers 38 # NUM_XIOSERVERS : number of stand-alone IO servers to employ 39 # set to zero if USING_MPMD="no" 48 40 # 49 41 # Principal script is sette.sh, that calls 50 42 # 51 # makenemo 52 # 53 # creates the exectuable in ${CONFIG_NAME}/BLD/bin/nemo.exe (and its link opa in ${CONFIG_NAME}/EXP00) 43 # makenemo : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe 44 # and links to opa in ${CONFIG_NAME}/EXP00) 54 45 # 55 46 # param.cfg : sets and loads following directories: 56 47 # 57 # FORCING_DIR : is the directory for forcing files (tarfile) 58 # 59 # INPUT_DIR : is the directory for input files storing 60 # 61 # TMPDIR : is the temporary directory (if needed) 48 # FORCING_DIR : is the directory for forcing files (tarfile) 49 # INPUT_DIR : is the directory for input files storing 50 # TMPDIR : is the temporary directory (if needed) 51 # NEMO_VALIDATION_DIR : is the validation directory 52 # 53 # (NOTE: this file is the same for all configrations to be tested with sette) 54 # 55 # all_functions.sh : loads functions used by sette (note: new functions can be added here) 56 # set_namelist : function declared in all_functions that sets namelist parameters 57 # post_test_tidyup : creates validation storage directory and copies required output files 58 # (solver.stat and ocean.output) in it after execution of test. 59 # 60 # VALIDATION tree is: 61 # 62 # NEMO_VALIDATION_DIR/WCONFIG_NAME/WCOMPILER_NAME/TEST_NAME/REVISION_NUMBER(or DATE) 63 # 64 # prepare_exe_dir.sh : defines and creates directory where the test is executed 65 # execution directory takes name of TEST_NAME defined for every test 66 # in sette.sh. (each test in executed in its own directory) 67 # 68 # prepare_job.sh : to generate the script run_job.sh 69 # 70 # fcm_job.sh : run in batch (INTERACT_FLAG="no") or interactive (INTERACT_FLAG="yes") 71 # see sette.sh and BATCH_TEMPLATE directory 72 # 73 # NOTE: jobs requiring initial or forcing data need to have an input_CONFIG.cfg in which 74 # can be found paths to the input tar file) 75 # NOTE: if job is not launched for any reason you have the executable ready in ${EXE_DIR} 76 # directory 77 # NOTE: the changed namelists are left in ${EXE_DIR} directory whereas original namelists 78 # remain in ${NEW_CONF}/EXP00 62 79 # 63 # NEMO_VALIDATION_DIR : is the validation directory 64 # 65 # (NOTE: this file is the same for all configrations to be tested with sette) 66 # 67 # 68 # all_functions.sh : loads functions used by sette (note: new functions can be added here) 69 # 70 # set_namelist : function declared in all_functions that set namelist parameters for tests 71 # 72 # post_test_tidyup : creates validation storage directory and copy needed output files (solver.stat and ocean.output) in it after execution of test. 73 # 74 # Tree of VALIDATION is: 75 # 76 # NEMO_VALIDATION_DIR/WCONFIG_NAME/WCOMPILER_NAME/TEST_NAME/REVISION_NUMBER(or DATE) 77 # 78 # 79 # prepare_exe_dir.sh : defines and creates directory where the test is executed 80 # 81 # execution directory takes name of TEST_NAME defined in every test in sette.sh 82 # 83 # ( each test in executed in its own directory ) 84 # 85 # 86 # prepare_job.sh 87 # 88 # to generate the script run_job.sh 89 # 90 # fcm_job.sh 91 # 92 # run in batch (INTERACT_FLAG="no") or interactive (INTERACT_FLAG="yes") see sette.sh and BATCH_TEMPLATE directory 93 # 94 # (note this job needs to have an input_CONFIG.cfg in which can be found input tar file) 95 # 96 # NOTE: if job is not launched for some problems you have executable ready in ${EXE_DIR} directory 97 # 98 # NOTE: the changed namelists are leaved in ${EXE_DIR} directory whereas original namelist remains in ${NEW_CONF}/EXP00 99 # 100 # in ${SETTE_DIR} is created output.sette with the echo of executed commands 101 # 102 # if sette.sh is stopped in output.sette there is written the last command executed by sette.sh 103 # 104 # if you run: ./sette.sh 2>&1 | tee out.sette 105 # 106 # in ${SETTE_DIR} out.sette is redirected standard error & standard output 107 # 108 # 109 # EXAMPLES 110 # ======== 111 # 112 # :: 113 # 114 # $ ./sette.sh 115 # 116 # 117 # TODO 118 # ==== 119 # 120 # option debug 121 # 122 # EVOLUTIONS 123 # ========== 124 # 125 # $Id$ 126 # 127 # * creation 128 # 129 #- 130 # 131 #- 80 # NOTE: a log file, output.sette, is created in ${SETTE_DIR} with the echoes of 81 # executed commands 82 # 83 # NOTE: if sette.sh is stopped in output.sette there is written the last command 84 # executed by sette.sh 85 # 86 # example use: ./sette.sh 87 ######################################################################################### 88 # 132 89 # Compiler among those in NEMOGCM/ARCH 133 90 COMPILER=PW6_VARGAS … … 136 93 export INTERACT_FLAG="no" 137 94 export MPIRUN_FLAG="yes" 138 # IF YOU DON'T WANT TO USE XIOS : (this is a list of keys to be delete) 139 export KEY_XIOS="key_iomput" 140 # IF YOU WANT TO USE XIOS : 141 #export KEY_XIOS="" 142 95 export USING_XIOS="yes" 96 # 97 export DEL_KEYS="key_iomput" 98 if [ ${USING_XIOS} == "yes" ] 99 then 100 export DEL_KEYS="" 101 fi 102 # 103 # Settings which control the use of stand alone servers (only relevant if using xios) 104 # 105 export USING_MPMD="no" 106 export NUM_XIOSERVERS=4 107 export JOB_PREFIX=batch-mpmd 108 # 109 if [ ${USING_MPMD} == "no" ] 110 then 111 export NUM_XIOSERVERS=0 112 export JOB_PREFIX=batch 113 fi 114 # 115 # 116 if [ ${USING_MPMD} == "yes" ] && [ ${USING_XIOS} == "no"] 117 then 118 echo "Incompatible choices. MPMD mode requires the XIOS server" 119 exit 120 fi 121 # 143 122 144 123 # Directory to run the tests … … 152 131 # Copy job_batch_COMPILER file for specific compiler into job_batch_template 153 132 cd ${SETTE_DIR} 154 cp BATCH_TEMPLATE/ batch-${COMPILER} job_batch_template || exit133 cp BATCH_TEMPLATE/${JOB_PREFIX}-${COMPILER} job_batch_template || exit 155 134 156 135 for config in 1 2 3 4 5 6 7 8 9 … … 162 141 export TEST_NAME="LONG" 163 142 cd ${SETTE_DIR} 164 . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_LONG -r GYRE -j 8 add_key "key_mpp_mpi" del_key ${ KEY_XIOS}143 . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_LONG -r GYRE -j 8 add_key "key_mpp_mpi" del_key ${DEL_KEYS} 165 144 cd ${SETTE_DIR} 166 145 . param.cfg … … 169 148 JOB_FILE=${EXE_DIR}/run_job.sh 170 149 NPROC=4 171 \rm ${JOB_FILE}150 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 172 151 cd ${EXE_DIR} 173 152 set_namelist namelist cn_exp \"GYRE_LONG\" … … 180 159 set_namelist namelist jpnj 2 181 160 set_namelist namelist jpnij 4 182 cd ${SETTE_DIR} 183 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 161 if [ ${USING_MPMD} == "yes" ] ; then 162 set_xio_using_server iodef.xml true 163 else 164 set_xio_using_server iodef.xml false 165 fi 166 cd ${SETTE_DIR} 167 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 184 168 185 169 cd ${SETTE_DIR} … … 199 183 set_namelist namelist jpnij 4 200 184 set_namelist namelist cn_ocerst_in \"GYRE_LONG_00000060_restart\" 185 if [ ${USING_MPMD} == "yes" ] ; then 186 set_xio_using_server iodef.xml true 187 else 188 set_xio_using_server iodef.xml false 189 fi 201 190 for (( i=1; i<=$NPROC; i++)) ; do 202 191 L_NPROC=$(( $i - 1 )) … … 204 193 ln -sf ../LONG/GYRE_LONG_00000060_restart_${L_NPROC}.nc . 205 194 done 206 cd ${SETTE_DIR} 207 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 195 if [ ${USING_MPMD} == "yes" ] ; then 196 set_xio_using_server iodef.xml true 197 else 198 set_xio_using_server iodef.xml false 199 fi 200 cd ${SETTE_DIR} 201 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 208 202 cd ${SETTE_DIR} 209 203 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 214 208 export TEST_NAME="REPRO_1_4" 215 209 cd ${SETTE_DIR} 216 . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_4 -r GYRE -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${ KEY_XIOS}210 . ../CONFIG/makenemo -m ${CMP_NAM} -n GYRE_4 -r GYRE -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${DEL_KEYS} 217 211 cd ${SETTE_DIR} 218 212 . param.cfg … … 221 215 JOB_FILE=${EXE_DIR}/run_job.sh 222 216 NPROC=4 223 \rm ${JOB_FILE}217 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 224 218 cd ${EXE_DIR} 225 219 set_namelist namelist cn_exp \"GYRE_14\" … … 234 228 set_namelist namelist jpnj 4 235 229 set_namelist namelist jpnij 4 236 cd ${SETTE_DIR} 237 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 230 if [ ${USING_MPMD} == "yes" ] ; then 231 set_xio_using_server iodef.xml true 232 else 233 set_xio_using_server iodef.xml false 234 fi 235 cd ${SETTE_DIR} 236 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 238 237 cd ${SETTE_DIR} 239 238 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 244 243 JOB_FILE=${EXE_DIR}/run_job.sh 245 244 NPROC=4 246 \rm $JOB_FILE245 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 247 246 cd ${EXE_DIR} 248 247 set_namelist namelist cn_exp \"GYRE_22\" … … 256 255 set_namelist namelist jpnj 2 257 256 set_namelist namelist jpnij 4 258 cd ${SETTE_DIR} 259 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 257 if [ ${USING_MPMD} == "yes" ] ; then 258 set_xio_using_server iodef.xml true 259 else 260 set_xio_using_server iodef.xml false 261 fi 262 cd ${SETTE_DIR} 263 . ./prepare_job.sh input_GYRE.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 260 264 cd ${SETTE_DIR} 261 265 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 268 272 export TEST_NAME="LONG" 269 273 cd ${SETTE_DIR} 270 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_LONG -r ORCA2_LIM_PISCES -j 8 add_key "key_mpp_mpi" del_key ${ KEY_XIOS}274 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_LONG -r ORCA2_LIM_PISCES -j 8 add_key "key_mpp_mpi" del_key ${DEL_KEYS} 271 275 cd ${SETTE_DIR} 272 276 . param.cfg … … 275 279 JOB_FILE=${EXE_DIR}/run_job.sh 276 280 NPROC=4 277 \rm ${JOB_FILE}281 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 278 282 cd ${EXE_DIR} 279 283 set_namelist namelist cn_exp \"O2LP_LONG\" … … 298 302 set_namelist namelist_pisces ln_ironsed .false. 299 303 set_namelist namelist_pisces ln_hydrofe .false. 300 cd ${SETTE_DIR} 301 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 304 if [ ${USING_MPMD} == "yes" ] ; then 305 set_xio_using_server iodef.xml true 306 else 307 set_xio_using_server iodef.xml false 308 fi 309 cd ${SETTE_DIR} 310 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 302 311 303 312 cd ${SETTE_DIR} … … 341 350 ln -sf ../LONG/O2LP_LONG_00000075_restart_ice_${L_NPROC}.nc . 342 351 done 343 cd ${SETTE_DIR} 344 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 352 if [ ${USING_MPMD} == "yes" ] ; then 353 set_xio_using_server iodef.xml true 354 else 355 set_xio_using_server iodef.xml false 356 fi 357 cd ${SETTE_DIR} 358 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 345 359 cd ${SETTE_DIR} 346 360 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 351 365 export TEST_NAME="REPRO_4_4" 352 366 cd ${SETTE_DIR} 353 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_16 -r ORCA2_LIM_PISCES -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${ KEY_XIOS}367 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2LIMPIS_16 -r ORCA2_LIM_PISCES -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${DEL_KEYS} 354 368 cd ${SETTE_DIR} 355 369 . param.cfg … … 358 372 JOB_FILE=${EXE_DIR}/run_job.sh 359 373 NPROC=16 360 \rm $JOB_FILE374 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 361 375 cd ${EXE_DIR} 362 376 set_namelist namelist nn_it000 1 … … 383 397 # put ln_pisdmp to false : no restoring to global mean value 384 398 set_namelist namelist_pisces ln_pisdmp .false. 385 cd ${SETTE_DIR} 386 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 399 if [ ${USING_MPMD} == "yes" ] ; then 400 set_xio_using_server iodef.xml true 401 else 402 set_xio_using_server iodef.xml false 403 fi 404 cd ${SETTE_DIR} 405 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 387 406 cd ${SETTE_DIR} 388 407 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 393 412 JOB_FILE=${EXE_DIR}/run_job.sh 394 413 NPROC=16 395 \rm $JOB_FILE414 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 396 415 cd ${EXE_DIR} 397 416 set_namelist namelist nn_it000 1 … … 417 436 # put ln_pisdmp to false : no restoring to global mean value 418 437 set_namelist namelist_pisces ln_pisdmp .false. 419 cd ${SETTE_DIR} 420 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 438 if [ ${USING_MPMD} == "yes" ] ; then 439 set_xio_using_server iodef.xml true 440 else 441 set_xio_using_server iodef.xml false 442 fi 443 cd ${SETTE_DIR} 444 . ./prepare_job.sh input_ORCA2_LIM_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 421 445 cd ${SETTE_DIR} 422 446 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 428 452 export TEST_NAME="LONG" 429 453 cd ${SETTE_DIR} 430 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_LONG -r ORCA2_OFF_PISCES -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${ KEY_XIOS}454 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_LONG -r ORCA2_OFF_PISCES -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${DEL_KEYS} 431 455 cd ${SETTE_DIR} 432 456 . param.cfg … … 435 459 JOB_FILE=${EXE_DIR}/run_job.sh 436 460 NPROC=4 437 \rm $JOB_FILE461 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 438 462 cd ${EXE_DIR} 439 463 set_namelist namelist cn_exp \"OFFP_LONG\" … … 459 483 # put ln_pisdmp to false : no restoring to global mean value 460 484 set_namelist namelist_pisces ln_pisdmp .false. 461 cd ${SETTE_DIR} 462 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 485 if [ ${USING_MPMD} == "yes" ] ; then 486 set_xio_using_server iodef.xml true 487 else 488 set_xio_using_server iodef.xml false 489 fi 490 cd ${SETTE_DIR} 491 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 463 492 464 493 cd ${SETTE_DIR} … … 495 524 # put ln_pisdmp to false : no restoring to global mean value 496 525 set_namelist namelist_pisces ln_pisdmp .false. 497 cd ${SETTE_DIR} 498 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 526 if [ ${USING_MPMD} == "yes" ] ; then 527 set_xio_using_server iodef.xml true 528 else 529 set_xio_using_server iodef.xml false 530 fi 531 cd ${SETTE_DIR} 532 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 499 533 cd ${SETTE_DIR} 500 534 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 505 539 export TEST_NAME="REPRO_4_4" 506 540 cd ${SETTE_DIR} 507 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_16 -r ORCA2_OFF_PISCES -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${ KEY_XIOS}541 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2OFFPIS_16 -r ORCA2_OFF_PISCES -j 8 add_key "key_mpp_mpi key_mpp_rep" del_key ${DEL_KEYS} 508 542 cd ${SETTE_DIR} 509 543 . param.cfg … … 512 546 JOB_FILE=${EXE_DIR}/run_job.sh 513 547 NPROC=16 514 \rm $JOB_FILE548 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 515 549 cd ${EXE_DIR} 516 550 set_namelist namelist nn_it000 1 … … 535 569 # put ln_pisdmp to false : no restoring to global mean value 536 570 set_namelist namelist_pisces ln_pisdmp .false. 537 cd ${SETTE_DIR} 538 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 571 if [ ${USING_MPMD} == "yes" ] ; then 572 set_xio_using_server iodef.xml true 573 else 574 set_xio_using_server iodef.xml false 575 fi 576 cd ${SETTE_DIR} 577 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 539 578 cd ${SETTE_DIR} 540 579 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 545 584 JOB_FILE=${EXE_DIR}/run_job.sh 546 585 NPROC=16 547 \rm $JOB_FILE586 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 548 587 cd ${EXE_DIR} 549 588 set_namelist namelist nn_it000 1 … … 568 607 # put ln_pisdmp to false : no restoring to global mean value 569 608 set_namelist namelist_pisces ln_pisdmp .false. 570 cd ${SETTE_DIR} 571 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 609 if [ ${USING_MPMD} == "yes" ] ; then 610 set_xio_using_server iodef.xml true 611 else 612 set_xio_using_server iodef.xml false 613 fi 614 cd ${SETTE_DIR} 615 . ./prepare_job.sh input_ORCA2_OFF_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 572 616 cd ${SETTE_DIR} 573 617 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 579 623 export TEST_NAME="LONG" 580 624 cd ${SETTE_DIR} 581 . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 add_key "key_tide" del_key ${ KEY_XIOS}625 . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_LONG -r AMM12 -j 8 add_key "key_tide" del_key ${DEL_KEYS} 582 626 cd ${SETTE_DIR} 583 627 . param.cfg … … 586 630 JOB_FILE=${EXE_DIR}/run_job.sh 587 631 NPROC=32 588 \rm $JOB_FILE632 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 589 633 cd ${EXE_DIR} 590 634 set_namelist namelist nn_it000 1 … … 600 644 set_namelist namelist jpnj 4 601 645 set_namelist namelist jpnij 32 602 cd ${SETTE_DIR} 603 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 646 if [ ${USING_MPMD} == "yes" ] ; then 647 set_xio_using_server iodef.xml true 648 else 649 set_xio_using_server iodef.xml false 650 fi 651 cd ${SETTE_DIR} 652 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 604 653 605 654 cd ${SETTE_DIR} … … 625 674 ln -sf ../LONG/AMM12_00000006_restart_${L_NPROC}.nc . 626 675 done 627 cd ${SETTE_DIR} 628 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 676 if [ ${USING_MPMD} == "yes" ] ; then 677 set_xio_using_server iodef.xml true 678 else 679 set_xio_using_server iodef.xml false 680 fi 681 cd ${SETTE_DIR} 682 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 629 683 cd ${SETTE_DIR} 630 684 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 635 689 export TEST_NAME="REPRO_8_4" 636 690 cd ${SETTE_DIR} 637 . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 -j 8 add_key "key_mpp_rep key_tide" del_key ${ KEY_XIOS}691 . ../CONFIG/makenemo -m ${CMP_NAM} -n AMM12_32 -r AMM12 -j 8 add_key "key_mpp_rep key_tide" del_key ${DEL_KEYS} 638 692 cd ${SETTE_DIR} 639 693 . param.cfg … … 642 696 JOB_FILE=${EXE_DIR}/run_job.sh 643 697 NPROC=32 644 \rm ${JOB_FILE}698 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 645 699 cd ${EXE_DIR} 646 700 set_namelist namelist nn_it000 1 … … 655 709 set_namelist namelist jpnj 4 656 710 set_namelist namelist jpnij 32 657 cd ${SETTE_DIR} 658 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 711 if [ ${USING_MPMD} == "yes" ] ; then 712 set_xio_using_server iodef.xml true 713 else 714 set_xio_using_server iodef.xml false 715 fi 716 cd ${SETTE_DIR} 717 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 659 718 cd ${SETTE_DIR} 660 719 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 675 734 set_namelist namelist jpnj 8 676 735 set_namelist namelist jpnij 32 677 cd ${SETTE_DIR} 678 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 736 if [ ${USING_MPMD} == "yes" ] ; then 737 set_xio_using_server iodef.xml true 738 else 739 set_xio_using_server iodef.xml false 740 fi 741 cd ${SETTE_DIR} 742 . ./prepare_job.sh input_AMM12.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 679 743 cd ${SETTE_DIR} 680 744 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 686 750 export TEST_NAME="SHORT" 687 751 cd ${SETTE_DIR} 688 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM -j 8 add_key "key_mpp_mpi key_mpp_rep key_agrif" del_key "key_zdftmx" del_key ${ KEY_XIOS}752 . ../CONFIG/makenemo -m ${CMP_NAM} -n ORCA2AGUL_1_2 -r ORCA2_LIM -j 8 add_key "key_mpp_mpi key_mpp_rep key_agrif" del_key "key_zdftmx" del_key ${DEL_KEYS} 689 753 cd ${SETTE_DIR} 690 754 . param.cfg … … 693 757 JOB_FILE=${EXE_DIR}/run_job.sh 694 758 NPROC=2 695 \rm ${JOB_FILE}759 if [ -f ${JOB_FILE} ] ; then \rm ${JOB_FILE} ; fi 696 760 cd ${EXE_DIR} 697 761 set_namelist namelist nn_it000 1 … … 706 770 set_namelist 1_namelist ln_ctl .false. 707 771 set_namelist 1_namelist ln_clobber .true. 708 cd ${SETTE_DIR} 709 . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} 772 if [ ${USING_MPMD} == "yes" ] ; then 773 set_xio_using_server iodef.xml true 774 else 775 set_xio_using_server iodef.xml false 776 fi 777 cd ${SETTE_DIR} 778 . ./prepare_job.sh input_ORCA2_LIM_AGRIF.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 710 779 cd ${SETTE_DIR} 711 780 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG}
Note: See TracChangeset
for help on using the changeset viewer.