Commit cd5e715b authored by Christophe Hourdin's avatar Christophe Hourdin
Browse files

minor changes

parent 921ffcc1
......@@ -21,7 +21,6 @@ module load intel-mpi/19.0.4
module load netcdf-fortran/4.5.2-mpi
module load netcdf/4.7.2-mpi
module load hdf5/1.10.5-mpi
module load ncview
......
......@@ -91,14 +91,19 @@ if [ ${LOADL_STEP_NAME} == "get_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/compile/${MODEL_OCE}/${MODEL_OCE}_${COMPUTER}.exe .
${USE_XIOS} && cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/compile/xios/xios_launch.file_${COMPUTER}.base .
${USE_XIOS} && cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/compile/xios/${XIOS_VERSION}/bin/xios_server.exe .
echo ""
echo "get ocean input files :"
. ./getfile_oce.sh
echo ""
echo "get ocean restart files :" |tee listing_getrst_oce.txt
echo "see listing in ${EXEDIR}/listing_getrst_oce.txt"
. ./getrst_oce.sh >> listing_getrst_oce.txt
# Version for 1 file per proc (nemo/wrf)
# echo "get ocean restart files :" |tee listing_getrst_oce.txt
# echo "see listing in ${EXEDIR}/listing_getrst_oce.txt"
# . ./getrst_oce.sh >> listing_getrst_oce.txt
# echo ""
echo "get ocean restart files :"
. ./getrst_oce.sh
echo ""
fi
......@@ -113,7 +118,7 @@ if [ ${LOADL_STEP_NAME} == "get_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
fi
### Create namelist from namelist.base files
echo "making namelist files from namelist base files..."
echo "make namelist files from namelist base files..."
${USE_OCE} && ./make_namelist_oce.sh
${USE_ATM} && ./make_namelist_atm.sh
${USE_XIOS} && ./make_xios_launch.file.sh
......@@ -166,9 +171,13 @@ if [ ${LOADL_STEP_NAME} == "put_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
cd ${EXEDIR}
if ${USE_OCE} ; then
echo "put ocean restart & output files :" | tee listing_putfile_oce.txt
echo "see listing in ${EXEDIR}/listing_putfile_oce.txt"
. ${SCRIPTDIR}/putfile_oce.sh >> listing_putfile_oce.txt
# Version for 1 file per proc (nemo/wrf)
# echo "put ocean restart & output files :" | tee listing_putfile_oce.txt
# echo "see listing in ${EXEDIR}/listing_putfile_oce.txt"
# . ${SCRIPTDIR}/putfile_oce.sh >> listing_putfile_oce.txt
# echo ""
echo "put ocean restart & output files :"
. ${SCRIPTDIR}/putfile_oce.sh
echo ""
fi
......
......@@ -45,6 +45,7 @@ do
ext=""
SUBTIME=1
fi
namfile=croco.in${ext}
cpfile ${JOBDIR}/${ASCII_DIR_IMG_ROOT}/param_inputs/namelist.base_oce${ext} ${namfile}
TSP_OCE_2=$(( ${TSP_OCE} / ${SUBTIME} )) # time step used for each grid
......@@ -71,7 +72,8 @@ do
freq_diabio_avg2=$(( ${freq_diabio_avg} * ${SUBTIME} ))
fi
printf "\n AGRIF: ${nn} : SUBTIME: ${SUBTIME} TSP_OCE_2: ${TSP_OCE_2} OCE_NTSP_PDAY: ${OCE_NTSP_PDAY} OCE_NTSP_PJOB=${OCE_NTSP_PJOB} \n"
echo "AGRIF: ${nn} : SUBTIME: ${SUBTIME} TSP_OCE_2: ${TSP_OCE_2} OCE_NTSP_PDAY: ${OCE_NTSP_PDAY} OCE_NTSP_PJOB=${OCE_NTSP_PJOB}"
#
#-------
......
......@@ -10,7 +10,8 @@ set -ue
##======================================================================
printf "\n make xios_launch.file...\n"
echo ""
echo "make xios_launch.file..."
if [ ${COMPUTER} == "JEANZAY" ] ; then
......@@ -35,7 +36,8 @@ chmod 755 xios_launch.file
for nn in $( seq 0 ${AGRIFZ} ); do
[ ${nn} -eq 0 ] && suff="" || suff=".${nn}"
printf "\n make file_def${suff}.xml...\n"
echo ""
echo "make file_def${suff}.xml..."
if ${USE_BIOLOGY} && ${USE_PISCES} ; then
sed -e "s|<use_pisces>|true|"\
file_def${suff}.base.xml > file_def${suff}.xml
......
......@@ -58,15 +58,15 @@ if [ "${MODEL_OCE}" == "croco" ] ; then
# export out_list="avg his diabio_avg"
export out_list="avg diabio_avg"
# export freq_out='day'
# export freq_his=20000;
# export freq_avg=31;
# export freq_diabio_avg=31
export freq_out='day'
export freq_his=20000;
export freq_avg=5;
export freq_diabio_avg=5
export freq_out='tsp'
export freq_his=20000
export freq_avg=15
export freq_diabio_avg=15
# export freq_out='tsp'
# export freq_his=20000
# export freq_avg=15
# export freq_diabio_avg=15
fi
......@@ -94,6 +94,7 @@ export USE_OPENMP=false
export NPP=4
# XIOS
# Modify the xml files in the param_inputs directory to select the fields and the frequency of the outputs
export USE_XIOS=true
export XIOS_VERSION="XIOS_X64_${COMPUTER}_trunk_r2219-2021_09_06"
export NXIOS=24 #4
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment