Changeset 9576 for branches/2017/dev_merge_2017
- Timestamp:
- 2018-05-11T16:50:48+02:00 (6 years ago)
- Location:
- branches/2017/dev_merge_2017/NEMOGCM
- Files:
-
- 37 edited
- 3 moved
Legend:
- Unmodified
- Added
- Removed
-
branches/2017/dev_merge_2017/NEMOGCM/CONFIG/SPITZ12/MY_SRC/sbcblk.F90
r9552 r9576 45 45 USE sbc_ice ! Surface boundary condition: ice fields 46 46 USE lib_fortran ! to use key_nosignedzero 47 #if defined key_ lim347 #if defined key_si3 48 48 USE ice , ONLY : u_ice, v_ice, jpl, a_i_b, at_i_b, tm_su, rn_cnd_s 49 49 USE icethd_dh ! for CALL ice_thd_snwblow … … 65 65 PUBLIC sbc_blk_init ! called in sbcmod 66 66 PUBLIC sbc_blk ! called in sbcmod 67 #if defined key_ lim367 #if defined key_si3 68 68 PUBLIC blk_ice_tau ! routine called in iceforcing 69 69 PUBLIC blk_ice_flx ! routine called in iceforcing … … 539 539 & * ( MIN( sf(jp_tair)%fnow(:,:,1), rt0_snow ) - rt0 ) * cpic * tmask(:,:,1) 540 540 ! 541 #if defined key_ lim3541 #if defined key_si3 542 542 qns_oce(:,:) = zqlw(:,:) - zqsb(:,:) - zqla(:,:) ! non solar without emp (only needed by LIM3) 543 543 qsr_oce(:,:) = qsr(:,:) … … 690 690 END FUNCTION L_vap 691 691 692 #if defined key_ lim3692 #if defined key_si3 693 693 !!---------------------------------------------------------------------- 694 !! 'key_ lim3' ESIM sea-ice model694 !! 'key_si3' ESIM sea-ice model 695 695 !!---------------------------------------------------------------------- 696 696 !! blk_ice_tau : provide the air-ice stress -
branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/CANAL/MY_SRC/diawri.F90
r9403 r9576 51 51 USE ioipsl ! 52 52 53 #if defined key_ lim353 #if defined key_si3 54 54 USE icewri 55 55 #endif … … 1076 1076 ENDIF 1077 1077 1078 #if defined key_ lim31078 #if defined key_si3 1079 1079 IF( nn_ice == 2 ) THEN ! condition needed in case agrif + ice-model but no-ice in child grid 1080 1080 CALL ice_wri_state( kt, id_i, nh_i ) -
branches/2017/dev_merge_2017/NEMOGCM/CONFIG/TEST_CASES/WAD/MY_SRC/bdyini.F90
r9168 r9576 344 344 IF(lwp) WRITE(numout,*) 345 345 346 #if defined key_ lim3346 #if defined key_si3 347 347 IF(lwp) WRITE(numout,*) 'Boundary conditions for sea ice: ' 348 348 SELECT CASE( cn_ice_lim(ib_bdy) ) -
branches/2017/dev_merge_2017/NEMOGCM/CONFIG/cfg.txt
r9575 r9576 15 15 ORCA2_SAS_SI3_ST OCE_SRC ICE_SRC NST_SRC SAS_SRC 16 16 ORCA2_SI3_OBS_ST OCE_SRC ICE_SRC 17 AGRIF_NORDIC_ST OCE_SRC ICE_SRC NST_SRC 18 AGRIF_NORDIC_NOAGRIF_ST OCE_SRC ICE_SRC NST_SRC 19 SPITZ12_ST OCE_SRC ICE_SRC -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT
- Property svn:executable deleted
r8468 r9576 84 84 # Run the parallel MPI executable 85 85 # 86 echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $OCEANCORES " ./ opa"86 echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $OCEANCORES " ./nemo" 87 87 # 88 time ${MPT_HOME}/bin/mpiexec_mpt -np $OCEANCORES ./ opa88 time ${MPT_HOME}/bin/mpiexec_mpt -np $OCEANCORES ./nemo 89 89 # 90 90 post_test_tidyup -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-IBM_EKMAN_INGV
- Property svn:executable deleted
r8468 r9576 30 30 export MP_SHARED_MEMORY=yes 31 31 export MPIRUN="mpirun -n $OCEANCORES" 32 export MPIRUN_MPMD="mpirun -np $OCEANCORES ./ opa: -np $XIOS_NUMPROCS /home/delrosso/XIOS_1.0/xios-1.0/bin/xios_server.exe"32 export MPIRUN_MPMD="mpirun -np $OCEANCORES ./nemo : -np $XIOS_NUMPROCS /home/delrosso/XIOS_1.0/xios-1.0/bin/xios_server.exe" 33 33 34 34 # … … 69 69 # Run the parallel MPI executable 70 70 # 71 # echo "Running time ${MPIRUN} " $OCEANCORES " ./ opa"71 # echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 72 72 # 73 73 74 74 if [ MPI_FLAG == "yes" ]; then 75 75 if [ $XIOS_NUMPROCS -eq 0 ]; then 76 time ${MPIRUN} ./ opa76 time ${MPIRUN} ./nemo 77 77 else 78 78 time ${MPIRUN_MPMD} 79 79 fi 80 80 else 81 time ./ opa81 time ./nemo 82 82 fi 83 83 # -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW6_CALYPSO
- Property svn:executable deleted
r8468 r9576 65 65 # Run the parallel MPI executable 66 66 # 67 # echo "Running time ${MPIRUN} " $OCEANCORES " ./ opa"67 # echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 68 68 # 69 69 70 70 if [ MPI_FLAG == "yes" ]; then 71 time ${MPIRUN} ./ opa71 time ${MPIRUN} ./nemo 72 72 else 73 time ./ opa73 time ./nemo 74 74 fi 75 75 # -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW7_METO
- Property svn:executable deleted
r8468 r9576 71 71 if [ MPI_FLAG == "yes" ]; then 72 72 n=1 73 echo "./ opa" > ./alltasks73 echo "./nemo" > ./alltasks 74 74 while [ $n -lt $OCEANCORES ] 75 75 do 76 echo "./ opa" >> ./alltasks76 echo "./nemo" >> ./alltasks 77 77 n=$(( $n + 1 )) 78 78 done 79 79 time ${MPIRUN} ./alltasks 80 80 else 81 time ./ opa81 time ./nemo 82 82 fi 83 83 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-PW7_MONSOON
- Property svn:executable deleted
r8468 r9576 70 70 if [ MPI_FLAG == "yes" ]; then 71 71 n=1 72 echo "./ opa" > ./alltasks72 echo "./nemo" > ./alltasks 73 73 while [ $n -lt $OCEANCORES ] 74 74 do 75 echo "./ opa" >> ./alltasks75 echo "./nemo" >> ./alltasks 76 76 n=$(( $n + 1 )) 77 77 done 78 78 time ${MPIRUN} ./alltasks 79 79 else 80 time ./ opa80 time ./nemo 81 81 fi 82 82 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA
r8468 r9576 63 63 # Run the parallel MPI executable 64 64 # 65 # echo "Running time ${MPIRUN} ./ opa"65 # echo "Running time ${MPIRUN} ./nemo" 66 66 # 67 67 if [ MPI_FLAG == "yes" ]; then 68 echo "Running time ${MPIRUN} ./ opa-procs $OCEANCORES"69 time ${MPIRUN} ./ opa-procs $OCEANCORES68 echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES" 69 time ${MPIRUN} ./nemo -procs $OCEANCORES 70 70 else 71 echo "Running time ./ opa"72 time ./ opa71 echo "Running time ./nemo" 72 time ./nemo 73 73 fi 74 74 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_DEBUG
- Property svn:executable deleted
r8468 r9576 63 63 # Run the parallel MPI executable 64 64 # 65 # echo "Running time ${MPIRUN} ./ opa"65 # echo "Running time ${MPIRUN} ./nemo" 66 66 # 67 67 if [ MPI_FLAG == "yes" ]; then 68 echo "Running time ${MPIRUN} ./ opa-procs $OCEANCORES"69 time ${MPIRUN} ./ opa-procs $OCEANCORES68 echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES" 69 time ${MPIRUN} ./nemo -procs $OCEANCORES 70 70 else 71 echo "Running time ./ opa"72 time ./ opa71 echo "Running time ./nemo" 72 time ./nemo 73 73 fi 74 74 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_ADA_O0
- Property svn:executable deleted
r8468 r9576 64 64 # Run the parallel MPI executable 65 65 # 66 # echo "Running time ${MPIRUN} ./ opa"66 # echo "Running time ${MPIRUN} ./nemo" 67 67 # 68 68 if [ MPI_FLAG == "yes" ]; then 69 echo "Running time ${MPIRUN} ./ opa-procs $OCEANCORES"70 time ${MPIRUN} ./ opa-procs $OCEANCORES69 echo "Running time ${MPIRUN} ./nemo -procs $OCEANCORES" 70 time ${MPIRUN} ./nemo -procs $OCEANCORES 71 71 else 72 echo "Running time ./ opa"73 time ./ opa72 echo "Running time ./nemo" 73 time ./nemo 74 74 fi 75 75 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_CURIE
- Property svn:executable deleted
r8468 r9576 64 64 # Run the parallel MPI executable 65 65 # 66 echo "Running time ${MPIRUN} ./ opa"66 echo "Running time ${MPIRUN} ./nemo" 67 67 # 68 68 if [ MPI_FLAG == "yes" ]; then 69 time ${MPIRUN} ./ opa69 time ${MPIRUN} ./nemo 70 70 else 71 time ./ opa71 time ./nemo 72 72 fi 73 73 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-X64_MOBILIS
- Property svn:executable deleted
r9442 r9576 62 62 echo time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \ 63 63 -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode \ 64 --mca mpi_paffinity_alone 1 ./ opa64 --mca mpi_paffinity_alone 1 ./nemo 65 65 time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \ 66 66 -x MALLOC_TRIM_THRESHOLD_=33554432 -np $OCORES --bynode \ 67 --mca mpi_paffinity_alone 1 ./ opa67 --mca mpi_paffinity_alone 1 ./nemo 68 68 else 69 69 if [ ! -f ./xios_server.exe ] && [ -f ${XIO_HOME}/bin/xios_server.exe ]; then … … 81 81 -x MALLOC_TRIM_THRESHOLD_=33554432 \ 82 82 -np $XCORES ./xios_server.exe \ 83 : -np $OCORES --bynode --mca mpi_paffinity_alone 1 ./ opa83 : -np $OCORES --bynode --mca mpi_paffinity_alone 1 ./nemo 84 84 # 85 85 time `which mpirun` --report-bindings -x MALLOC_MMAP_MAX_=-1 \ 86 86 -x MALLOC_TRIM_THRESHOLD_=33554432 \ 87 87 -np $XCORES ./xios_server.exe \ 88 : -np $OCORES --bynode --mca mpi_paffinity_alone 1 ./ opa88 : -np $OCORES --bynode --mca mpi_paffinity_alone 1 ./nemo 89 89 # 90 90 fi -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC40_METO
- Property svn:executable deleted
r8468 r9576 71 71 exit 72 72 fi 73 echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./ opa74 time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./ opa73 echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 74 time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 75 75 # 76 76 else … … 78 78 # Run SPMD case 79 79 # 80 echo time aprun -b -n $OCORES -N $O_PER_NODE ./ opa81 time aprun -b -n $OCORES -N $O_PER_NODE ./ opa80 echo time aprun -b -n $OCORES -N $O_PER_NODE ./nemo 81 time aprun -b -n $OCORES -N $O_PER_NODE ./nemo 82 82 fi 83 83 # -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-XC_ARCHER_INTEL
- Property svn:executable deleted
r8468 r9576 71 71 # Run SPMD case 72 72 # 73 echo time aprun -b -n $OCORES -N $O_PER_NODE ./ opa74 time aprun -b -n $OCORES -N $O_PER_NODE ./ opa73 echo time aprun -b -n $OCORES -N $O_PER_NODE ./nemo 74 time aprun -b -n $OCORES -N $O_PER_NODE ./nemo 75 75 else 76 76 if [ ! -f ./xios_server.exe ] && [ -f ${XIO_HOME}/bin/xios_server.exe ]; then … … 85 85 # Run MPMD case 86 86 # 87 echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./ opa88 time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./ opa87 echo time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 88 time aprun -b -n $XCORES -N $X_PER_NODE ./xios_server.exe : -n $OCORES -N $O_PER_NODE ./nemo 89 89 # 90 90 fi -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena
- Property svn:executable deleted
r8468 r9576 65 65 # Run the parallel MPI executable 66 66 # 67 # echo "Running time ${MPIRUN} " $OCEANCORES " ./ opa"67 # echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 68 68 # 69 69 70 70 if [ MPI_FLAG == "yes" ]; then 71 time ${MPIRUN} ./ opa71 time ${MPIRUN} ./nemo 72 72 else 73 time ./ opa73 time ./nemo 74 74 fi 75 75 # -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ifort_athena_xios
- Property svn:executable deleted
r8468 r9576 71 71 # Run the parallel MPI executable 72 72 # 73 # echo "Running time ${MPIRUN} " $OCEANCORES " ./ opa"73 # echo "Running time ${MPIRUN} " $OCEANCORES " ./nemo" 74 74 # 75 75 76 76 if [ MPI_FLAG == "yes" ]; then 77 77 if [ $XIOS_NUMPROCS -eq 0 ]; then 78 time ${MPIRUN} ./ opa78 time ${MPIRUN} ./nemo 79 79 else 80 80 … … 85 85 k=0 86 86 while (( k < $OCEANCORES )) ; do 87 echo ./ opa>> xioscmdfile87 echo ./nemo >> xioscmdfile 88 88 k=`expr $k + 1` 89 89 done … … 97 97 fi 98 98 else 99 time ./ opa99 time ./nemo 100 100 fi 101 101 # -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-macport_osx
r8468 r9576 66 66 # 67 67 if [ MPI_FLAG == "yes" ]; then 68 echo "Running time ${MPIRUN} ./ opa"69 time ${MPIRUN} ./ opa68 echo "Running time ${MPIRUN} ./nemo" 69 time ${MPIRUN} ./nemo 70 70 else 71 echo "Running time./ opa"72 time ./ opa71 echo "Running time./nemo" 72 time ./nemo 73 73 fi 74 74 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-macport_osx_debug
r8468 r9576 66 66 # 67 67 if [ MPI_FLAG == "yes" ]; then 68 echo "Running time ${MPIRUN} ./ opa"69 time ${MPIRUN} ./ opa68 echo "Running time ${MPIRUN} ./nemo" 69 time ${MPIRUN} ./nemo 70 70 else 71 echo "Running time./ opa"72 time ./ opa71 echo "Running time./nemo" 72 time ./nemo 73 73 fi 74 74 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-mpmd-ALTIX_NAUTILUS_MPT
- Property svn:executable deleted
r8468 r9576 97 97 # Run the parallel MPI executable 98 98 # 99 echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $XIOCORES " ./xios_server.exe : -np " $OCEANCORES " ./ opa"99 echo "Running time ${MPT_HOME}/bin/mpiexec_mpt -np " $XIOCORES " ./xios_server.exe : -np " $OCEANCORES " ./nemo" 100 100 # 101 time ${MPT_HOME}/bin/mpiexec_mpt -np $XIOCORES ./xios_server.exe : -np $OCEANCORES ./ opa101 time ${MPT_HOME}/bin/mpiexec_mpt -np $XIOCORES ./xios_server.exe : -np $OCEANCORES ./nemo 102 102 # 103 103 post_test_tidyup -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-openmpi_KARA_MERCATOR_XIOS
- Property svn:executable deleted
r9480 r9576 58 58 # Run the parallel MPI executable 59 59 # 60 echo "Running time ${MPIRUN} ./ opa"60 echo "Running time ${MPIRUN} ./nemo" 61 61 # 62 62 if [ MPI_FLAG == "yes" ]; then 63 mpirun -np $OCEANCORES ./ opa63 mpirun -np $OCEANCORES ./nemo 64 64 else 65 time ./ opa65 time ./nemo 66 66 fi 67 67 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/batch-openmpi_NAVITI_MERCATOR
- Property svn:executable deleted
r8469 r9576 58 58 # Run the parallel MPI executable 59 59 # 60 echo "Running time ${MPIRUN} ./ opa"60 echo "Running time ${MPIRUN} ./nemo" 61 61 # 62 62 if [ MPI_FLAG == "yes" ]; then 63 mpirun -np $OCEANCORES ./ opa63 mpirun -np $OCEANCORES ./nemo 64 64 else 65 time ./ opa65 time ./nemo 66 66 fi 67 67 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/BATCH_TEMPLATE/sette_batch_template
- Property svn:executable deleted
r8468 r9576 66 66 # 67 67 if [ MPI_FLAG == "yes" ]; then 68 echo "Running time ${MPIRUN} ./ opa"69 time ${MPIRUN} ./ opa68 echo "Running time ${MPIRUN} ./nemo" 69 time ${MPIRUN} ./nemo 70 70 else 71 echo "Running time./ opa"72 time ./ opa71 echo "Running time./nemo" 72 time ./nemo 73 73 fi 74 74 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/all_functions.sh
r9534 r9576 412 412 413 413 414 [ -f ${EXE_DIR}/field_def_nemo-o pa.xml ] || sed -i '/field_def_nemo-opa/d' $1415 [ -f ${EXE_DIR}/field_def_nemo- lim.xml ] || sed -i '/field_def_nemo-lim/d' $1414 [ -f ${EXE_DIR}/field_def_nemo-oce.xml ] || sed -i '/field_def_nemo-oce/d' $1 415 [ -f ${EXE_DIR}/field_def_nemo-ice.xml ] || sed -i '/field_def_nemo-ice/d' $1 416 416 [ -f ${EXE_DIR}/field_def_nemo-pisces.xml ] || sed -i '/field_def_nemo-pisces/d' $1 417 417 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_AGRIF.cfg
r9483 r9576 1 ORCA2_ LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.71 ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 2 2 AGRIF_NORDIC_v4.0.tar AGRIF_NORDIC_v4.0 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ORCA2_SI3_AGRIF.cfg
r9565 r9576 1 ORCA2_ LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.71 ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ORCA2_SI3_OBS.cfg
r9565 r9576 1 ORCA2_ LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.71 ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_ORCA2_SI3_PISCES.cfg
r9565 r9576 1 ORCA2_ LIM_nemo_v3.7.tar ORCA2_LIM_PISCES_v3.71 ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_PISCES_v3.7 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/input_SAS.cfg
r7646 r9576 1 ORCA2_ LIM_nemo_v3.7.tar ORCA2_LIM_nemo_v3.71 ORCA2_ICE_nemo_v3.7.tar ORCA2_ICE_nemo_v3.7 2 2 INPUTS_SAS_v3.5.tar SAS -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/iodef_sette.xml
- Property svn:executable deleted
r7715 r9576 12 12 ============================================================================================================ 13 13 --> 14 <field_definition src="DEF_SHARED/field_def_nemo-o pa.xml"/>15 <field_definition src="DEF_SHARED/field_def_nemo- lim.xml"/>14 <field_definition src="DEF_SHARED/field_def_nemo-oce.xml"/> 15 <field_definition src="DEF_SHARED/field_def_nemo-ice.xml"/> 16 16 <field_definition src="DEF_SHARED/field_def_nemo-pisces.xml"/> 17 17 <!-- … … 165 165 ============================================================================================================ 166 166 --> 167 <field_definition src="DEF_SHARED/field_def_nemo-o pa.xml"/>168 <field_definition src="DEF_SHARED/field_def_nemo- lim.xml"/>167 <field_definition src="DEF_SHARED/field_def_nemo-oce.xml"/> 168 <field_definition src="DEF_SHARED/field_def_nemo-ice.xml"/> 169 169 <field_definition src="DEF_SHARED/field_def_nemo-pisces.xml"/> 170 170 <!-- -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/param.cfg
r9161 r9576 1 1 #- forcing files storing 2 FORCING_DIR= ~/FORCING2 FORCING_DIR=$WORKDIR/NEMO/FORC 3 3 #- input files storing 4 4 INPUT_DIR=${CONFIG_DIR}/${NEW_CONF}/EXP00 -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/prepare_job.sh
r9480 r9576 155 155 # RUN OPA 156 156 cd ${EXE_DIR} 157 if [ ! -r ${EXE_DIR}/ opa]157 if [ ! -r ${EXE_DIR}/nemo ] 158 158 then 159 echo "executable opadoes not exist"160 echo "executable opadoes not exist, exit" >> ${SETTE_DIR}/output.sette159 echo "executable nemo does not exist" 160 echo "executable nemo does not exist, exit" >> ${SETTE_DIR}/output.sette 161 161 exit 1 162 162 fi -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette.sh
r9560 r9576 42 42 # 43 43 # makenemo : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe 44 # and links to opain ${CONFIG_NAME}/EXP00)44 # and links to nemo in ${CONFIG_NAME}/EXP00) 45 45 # 46 46 # param.cfg : sets and loads following directories: … … 134 134 # Description of configuration tested: 135 135 # GYRE_PISCES : 1 136 # ORCA2_ LIM3_PISCES: 2136 # ORCA2_SI3_PISCES : 2 137 137 # ORCA2_OFF_PISCES : 3 138 138 # AMM12 : 4 139 139 # SAS : 5 140 # ORCA2_ LIM3_OBS: 6140 # ORCA2_SI3_OBS : 6 141 141 # AGRIF : 7 & 8 test AGRIF in a double zoom configuration (AGRIF_NORDIC) 142 142 # and check that key_agrif without zoom = no key_agrif 143 143 # SPITZ12 : 9 regional configuration including sea-ice and tides (Spitzbergen) 144 144 145 for config in 1 2 3 4 5 6 7 8 9 145 #for config in 1 2 3 4 5 6 7 8 9 146 for config in 9 146 147 do 147 148 … … 272 273 273 274 # ----------------- 274 # ORCA2_ LIM3_PISCES275 # ORCA2_SI3_PISCES 275 276 # ----------------- 276 277 if [ ${config} -eq 2 ] ; then 277 ## Restartability tests for ORCA2_ LIM3_PISCES278 ## Restartability tests for ORCA2_SI3_PISCES 278 279 export TEST_NAME="LONG" 279 280 cd ${CONFIG_DIR0} 280 . ./makenemo -m ${CMP_NAM} -n ORCA2_ LIM3_PISCES_ST -r ORCA2_LIM3_PISCES -j 8 del_key ${DEL_KEYS}281 . ./makenemo -m ${CMP_NAM} -n ORCA2_SI3_PISCES_ST -r ORCA2_SI3_PISCES -j 8 del_key ${DEL_KEYS} 281 282 cd ${SETTE_DIR} 282 283 . ./param.cfg … … 315 316 fi 316 317 cd ${SETTE_DIR} 317 . ./prepare_job.sh input_ORCA2_ LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS}318 . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 318 319 319 320 cd ${SETTE_DIR} … … 362 363 fi 363 364 cd ${SETTE_DIR} 364 . ./prepare_job.sh input_ORCA2_ LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS}365 cd ${SETTE_DIR} 366 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 367 368 ## Reproducibility tests for ORCA2_ LIM3_PISCES365 . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 366 cd ${SETTE_DIR} 367 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} 368 369 ## Reproducibility tests for ORCA2_SI3_PISCES 369 370 export TEST_NAME="REPRO_4_8" 370 371 cd ${CONFIG_DIR0} … … 403 404 fi 404 405 cd ${SETTE_DIR} 405 . ./prepare_job.sh input_ORCA2_ LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS}406 . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 406 407 cd ${SETTE_DIR} 407 408 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 440 441 fi 441 442 cd ${SETTE_DIR} 442 . ./prepare_job.sh input_ORCA2_ LIM3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS}443 . ./prepare_job.sh input_ORCA2_SI3_PISCES.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 443 444 cd ${SETTE_DIR} 444 445 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 729 730 export TEST_NAME="LONG" 730 731 cd ${CONFIG_DIR0} 731 . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_ LIM3_ST -r ORCA2_SAS_LIM3 -j 8 del_key ${DEL_KEYS}732 . ./makenemo -m ${CMP_NAM} -n ORCA2_SAS_SI3_ST -r ORCA2_SAS_SI3 -j 8 del_key ${DEL_KEYS} 732 733 cd ${SETTE_DIR} 733 734 . ./param.cfg … … 839 840 840 841 # -------------- 841 # ORCA2_ LIM3_OBS842 # ORCA2_SI3_OBS 842 843 # -------------- 843 844 ## Test assimilation interface code, OBS and ASM for reproducibility … … 847 848 export TEST_NAME="REPRO_4_8" 848 849 cd ${CONFIG_DIR0} 849 . ./makenemo -m ${CMP_NAM} -n ORCA2_ LIM3_OBS_ST -r ORCA2_LIM3_PISCES -d "OPA_SRC LIM_SRC_3" -j 8 add_key "key_asminc" del_key "key_top"850 . ./makenemo -m ${CMP_NAM} -n ORCA2_SI3_OBS_ST -r ORCA2_SI3_PISCES -d "OCE_SRC ICE_SRC" -j 8 add_key "key_asminc" del_key "key_top" 850 851 cd ${SETTE_DIR} 851 852 . ./param.cfg … … 875 876 set_namelist namelist_cfg ln_sshinc .true. 876 877 set_namelist namelist_cfg ln_asmiau .true. 877 #remove all useless options for pisces (due to ORCA2_ LIM3_PISCES reference configuration)878 #remove all useless options for pisces (due to ORCA2_SI3_PISCES reference configuration) 878 879 set_namelist namelist_top_cfg ln_trcdta .false. 879 880 # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false … … 894 895 fi 895 896 cd ${SETTE_DIR} 896 . ./prepare_job.sh input_ORCA2_ LIM3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS}897 . ./prepare_job.sh input_ORCA2_SI3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 897 898 cd ${SETTE_DIR} 898 899 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} … … 924 925 set_namelist namelist_cfg ln_sshinc .true. 925 926 set_namelist namelist_cfg ln_asmiau .true. 926 #remove all useless options for pisces (due to ORCA2_ LIM3_PISCES reference configuration)927 #remove all useless options for pisces (due to ORCA2_SI3_PISCES reference configuration) 927 928 set_namelist namelist_top_cfg ln_trcdta .false. 928 929 # put ln_ironsed, ln_river, ln_ndepo, ln_dust to false … … 943 944 fi 944 945 cd ${SETTE_DIR} 945 . ./prepare_job.sh input_ORCA2_ LIM3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS}946 . ./prepare_job.sh input_ORCA2_SI3_OBS.cfg $NPROC ${TEST_NAME} ${MPIRUN_FLAG} ${JOB_FILE} ${NUM_XIOSERVERS} 946 947 cd ${SETTE_DIR} 947 948 . ./fcm_job.sh $NPROC ${JOB_FILE} ${INTERACT_FLAG} ${MPIRUN_FLAG} -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_beginner.sh
r9019 r9576 41 41 # 42 42 # makenemo : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe 43 # and links to opain ${CONFIG_NAME}/EXP00)43 # and links to nemo in ${CONFIG_NAME}/EXP00) 44 44 # 45 45 # param.cfg : sets and loads following directories: -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_chk_result.sh
r9368 r9576 489 489 # Restartability test 490 490 # 491 for restart_test in WGYREPIS_ST WORCA2 LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST491 for restart_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2AGR_ST 492 492 do 493 493 resttest $NEMO_VALID $restart_test $pass … … 496 496 # Reproducibility tests 497 497 # 498 for repro_test in WGYREPIS_ST WORCA2 LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_LIM3_OBS_ST WORCA2AGR_ST498 for repro_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_SI3_OBS_ST WORCA2AGR_ST 499 499 do 500 500 reprotest $NEMO_VALID $repro_test $pass … … 516 516 echo 'and' 517 517 echo "$NEMO_VALID_REF at rev $NEMO_REV_REF" 518 for repro_test in WGYREPIS_ST WORCA2 LIM3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_LIM3_OBS_ST WORCA2AGR_ST518 for repro_test in WGYREPIS_ST WORCA2SI3PIS_ST WORCA2OFFPIS_ST WAMM12_ST WISOMIP_ST WORCA2_SI3_OBS_ST WORCA2AGR_ST 519 519 do 520 520 runcmpres $NEMO_VALID $repro_test $NEMO_VALID_REF $NEMO_REV_REF $pass -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.SAS.sh
r9019 r9576 302 302 # Restartability test 303 303 # 304 for restart_test in WGYREPIS_LONG WORCA2 LIM3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG304 for restart_test in WGYREPIS_LONG WORCA2SI3PIS_LONG WORCA2OFFPIS_LONG WAMM12_LONG WISOMIP_LONG WORCA2AGUL_LONG 305 305 do 306 306 resttest $NEMO_VALID $restart_test $pass … … 309 309 # Reproducibility tests 310 310 # 311 for repro_test in WGYREPIS_32 WORCA2 LIM3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_LIM3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG311 for repro_test in WGYREPIS_32 WORCA2SI3PIS_32 WORCA2OFFPIS_32 WAMM12_32 WISOMIP_32 WORCA2_SI3_OBS WORCA2AGUL_1_2 WORCA2AGUL_16 WORCA2AGUL_2_2_NAG 312 312 do 313 313 reprotest $NEMO_VALID $repro_test $pass -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_rpt.sh
r9553 r9576 35 35 cd ${TOOLS_DIR}/REBUILD_NEMO 36 36 #SF echo "REBUILD LONG restart SAS files, without standard output" 37 ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_ LIM3_ST/LONG/SAS_00000240_restart_ice $NPROC > /dev/null 2>&137 ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/LONG/SAS_00000240_restart_ice $NPROC > /dev/null 2>&1 38 38 #SF echo "REBUILD SHORT restart SAS files, without standard output" 39 ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_ LIM3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&-39 ./rebuild_nemo -t 4 ../../CONFIG/ORCA2_SAS_SI3_ST/SHORT/SAS_00000240_restart_ice $NPROC >&- 40 40 cd ${SAS_RESTART_DIR}/LONG 41 41 #SF echo "COPY rebuild restart files" … … 387 387 COMPIL_DIR=${TOOLS_DIR}/COMPILE 388 388 NPROC=32 389 SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_ LIM3_ST389 SAS_RESTART_DIR=${CONFIG_DIR0}/ORCA2_SAS_SI3_ST 390 390 # 391 391 # Show current revision tag and branch name … … 417 417 # Rebuild and restartability test for SAS 418 418 # clem: not needed anymore 419 # for restart_file in WORCA2_SAS_ LIM3_ST419 # for restart_file in WORCA2_SAS_SI3_ST 420 420 # do 421 421 # restfile $NEMO_VALID $restart_file $pass … … 425 425 echo "" 426 426 echo " !----restart----! " 427 for restart_test in WGYRE_PISCES_ST WORCA2_ LIM3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_LIM3_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WWAD_ST WSAS_BIPER_ST427 for restart_test in WGYRE_PISCES_ST WORCA2_SI3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_SI3_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST WOVERFLOW_ST WLOCK_EXCHANGE_ST WVORTEX_ST WWAD_ST WSAS_BIPER_ST 428 428 do 429 429 resttest $NEMO_VALID $restart_test $pass … … 433 433 echo "" 434 434 echo " !----repro----! " 435 for repro_test in WGYRE_PISCES_ST WORCA2_ LIM3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_LIM3_ST WORCA2_LIM3_OBS_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST435 for repro_test in WGYRE_PISCES_ST WORCA2_SI3_PISCES_ST WORCA2_OFF_PISCES_ST WAMM12_ST WORCA2_SAS_SI3_ST WORCA2_SI3_OBS_ST WAGRIF_NORDIC_ST WSPITZ12_ST WISOMIP_ST 436 436 do 437 437 reprotest $NEMO_VALID $repro_test $pass -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_test-cases.sh
r9524 r9576 45 45 # 46 46 # makenemo : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe 47 # and links to opain ${CONFIG_NAME}/EXP00)47 # and links to nemo in ${CONFIG_NAME}/EXP00) 48 48 # 49 49 # param.cfg : sets and loads following directories: -
branches/2017/dev_merge_2017/NEMOGCM/SETTE/sette_xios.sh
r9019 r9576 38 38 # 39 39 # makenemo : to create successive exectuables in ${CONFIG_NAME}/BLD/bin/nemo.exe 40 # and links to opain ${CONFIG_NAME}/EXP00)40 # and links to nemo in ${CONFIG_NAME}/EXP00) 41 41 # 42 42 # param.cfg : sets and loads following directories:
Note: See TracChangeset
for help on using the changeset viewer.