Skip to content

GitLab

Commit 328630be authored by HOURDIN Christophe's avatar HOURDIN Christophe
Browse files

history with init dir in jobdir for PRODUCTION mode

parent 2a315829
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 305 additions and 3600 deletions
README.txt
View file @ 328630be
......@@ -5,7 +5,21 @@
11/11/2020 : Version croco + agrif + pisces
Mode production OU mode test (à utiliser pour tunner avant la production)
# UNE SEULE COMPILATION A LA FOIS!!!
On parle d'Experience et Job
1 Experience = plusieurs job qui s'enchainent.
duree Experience = somme duree des jobs
Mode production OU mode test (à utiliser a priori pour tunner avant la production)
une fois la production lancee, on est plus sense toucher les scripts et
compile... si changement ça stop l'enchainement du job suivant et prévient du
changement.
Les tests se font avant a priori mais peuvent se faire pendant... attention
juste a la relance du job de production s'il detecte un changement dans les
scripts.
MODE_TEST=true
......@@ -15,7 +29,6 @@ scratch_dir que de tests.
Le mode test tourne sur 1 job seulemnent. Pas de calendrier de re soumission.
MODE_TEST=false => production de l'expérience.
Le mode production tourne sur tous les jobs de l'exp
......@@ -27,7 +40,10 @@ Une fois la production lancée, ne plus toucher les répertoires ascii, sinon te
Si on veut quand même faire des modifs en cours d'exp, on force la re soumission et une trace du changement est gardée dans jobs
...trace dans exp_ascii_dir_img_10010101/
debug few times ... pour développement des scripts
Toujours regarder les sorties pour savoir ce qui a tourné (croco_cpp.txt,
out_run.txt, output.namelist.pis, croco.in...)
Jamais les scripts de lancement qui sont susceptibles d'avoir été touchés
pendant la production ou ultérieurement...
bin/expdiff
View file @ 328630be
......@@ -3,7 +3,15 @@
# TEST config + model SUR CHACUNE des exp
export CONFIG=`pwd | awk -F"/" '{print $(NF-1)}'`
if [ `pwd | awk -F"/" '{print $(NF-0)}'` == "jobs" ] ; then
# On est dans le repertoire jobs
export CONFIG=`pwd | awk -F"/" '{print $(NF-3)}'`
INIT="init/"
else
export CONFIG=`pwd | awk -F"/" '{print $(NF-1)}'`
INIT=""
fi
echo "config : ${CONFIG}"
export MODEL=`echo ${CONFIG} | cut -d'_' -f2`
......@@ -24,13 +32,19 @@ fi
files_oce="\
scripts/namelist_exp.sh \
scripts/${MACHINE1}.env \
scripts/${MACHINE1}.header \
scripts/getfile_oce.sh \
scripts/getrst_oce.sh \
scripts/${MACHINE1}.env \
scripts/${MACHINE1}.header \
scripts/namelist_exp.sh \
param_inputs/namelist.base_oce"
files_compile_croco="\
compile/croco/cppdefs.h \
compile/croco/param.h \
compile/croco/jobcomp \
compile/croco/croco"
files_xios="\
param_inputs/domain_def.xml \
param_inputs/field_def.xml \
......@@ -43,11 +57,6 @@ compile/nemo/compile.sh \
compile/nemo/MY_SRC \
compile/nemo/nemo.exe"
files_compile_croco="\
compile/croco/cppdefs.h \
compile/croco/param.h \
compile/croco/jobcomp \
compile/croco/croco"
......@@ -55,10 +64,10 @@ compile/croco/croco"
#===============================================================================
### if OCEAN component
#===============================================================================
tt1=`grep 'USE_OCE' $1/scripts/namelist_exp.sh | grep -v USE_ATM`
tt1=`grep 'USE_OCE' $1/${INIT}scripts/namelist_exp.sh | grep -v USE_ATM`
eval ${tt1}
USE_OCE_1=${USE_OCE}
tt1=`grep 'USE_OCE' $2/scripts/namelist_exp.sh | grep -v USE_ATM`
tt1=`grep 'USE_OCE' $2/${INIT}scripts/namelist_exp.sh | grep -v USE_ATM`
eval ${tt1}
USE_OCE_2=${USE_OCE}
......@@ -67,47 +76,53 @@ USE_OCE_2=${USE_OCE}
if ${USE_OCE_1} && ${USE_OCE_2} ; then
printf "\n\n================================================================================\n"
printf " OCEAN (${MODEL} scripts) : diff %9s / %9s\n" $1 $2
printf "================================================================================\n"
echo ""
echo "================================================================================"
echo " OCEAN (${MODEL} scripts) :"
echo "================================================================================"
echo " $1/${INIT}"
echo " - $2/${INIT}"
echo ""
for file in ${files_oce} ; do
diff -b -w -r -x namelist_period.sh -x *.swp $1/${file} $2/${file} > ~/tmp_diff 2>&1
diff -b -w -r -x namelist_period.sh -x *.swp $1/${INIT}${file} $2/${INIT}${file} > ~/tmp_diff 2>&1
if [ -s ~/tmp_diff ] ; then
printf "\n--------------------------------------------------------------------------------\n"
printf " ${file}"
printf "\n--------------------------------------------------------------------------------\n"
printf " diff -b -w -r $1/${file} $2/${file}\n"
echo "--------------------------------------------------------------------------------"
echo " ${file}"
echo "--------------------------------------------------------------------------------"
echo "diff -b -w -r $1/${INIT}${file} \\"
echo " $2/${INIT}${file}"
cat ~/tmp_diff
echo ""
rm -f ~/tmp_diff
else
printf "\n--------------------------------------------------------------------------------\n"
printf " ${file} : same files"
printf "\n--------------------------------------------------------------------------------\n"
# else
# echo "--------------------------------------------------------------------------------"
# echo " ${file} : same files"
# echo "--------------------------------------------------------------------------------"
fi
done
echo ""
echo ""
echo ""
eval "files_compile=\${files_compile_${MODEL}}"
printf "\n\n================================================================================\n"
printf " OCEAN (${MODEL} compile) : diff %9s / %9s\n" $1 $2
printf "================================================================================\n"
diff -b -w -r -x *.swp $1/compile/${MODEL} $2/compile/${MODEL}
echo "================================================================================"
echo " OCEAN (${MODEL} compile) :"
echo "================================================================================"
echo " $1/${INIT}/compile/croco"
echo " - $2/${INIT}/compile/croco"
echo ""
# echo "diff -b -w -r -x *.swp -x croco_compile_listing.txt $1/${INIT}compile/${MODEL} $2/${INIT}compile/${MODEL}"
diff -b -w -r -x *.swp -x croco_compile_listing.txt $1/${INIT}compile/${MODEL} $2/${INIT}compile/${MODEL}
echo ""
echo ""
echo ""
# for file in ${files_compile} ; do
# diff -b -w -r -x *.swp $1/${file} $2/${file} > ~/tmp_diff 2>&1
# if [ -s ~/tmp_diff ] ; then
# printf "\n--------------------------------------------------------------------------------\n"
# printf " ${file}"
# printf "\n--------------------------------------------------------------------------------\n"
# printf " diff -b -w -r $1/${file} $2/${file}\n"
# cat ~/tmp_diff
# rm -f ~/tmp_diff
# else
# printf "\n--------------------------------------------------------------------------------\n"
# printf " ${file} : same files"
# printf "\n--------------------------------------------------------------------------------\n"
# fi
# done
# printf "\n\n================================================================================\n"
# printf " OCEAN (xios param) : diff %9s / %9s\n" $1 $2
......@@ -131,7 +146,7 @@ if ${USE_OCE_1} && ${USE_OCE_2} ; then
else
printf "\n\n================================================================================\n"
printf " OCEAN (${MODEL} scripts) : diff %9s / %9s\n" $1 $2
printf " OCEAN (${MODEL} scripts) : diff %9s / %9s\n" $1/${INIT} $2/${INIT}
printf "================================================================================\n"
printf "USE_OCE only in one exp \n"
printf "USE_OCE 1 : ${USE_OCE_1}\n"
......
compile/croco/zoombc_2D.F deleted 120000 → 0
View file @ 2a315829
zoombc_2D.F.SPOUS
\ No newline at end of file
compile/croco/zoombc_2D.F.ORIG_v2 deleted 100644 → 0
View file @ 2a315829
This diff is collapsed.
compile/croco/zoombc_2D.F.SPOUS deleted 100644 → 0
View file @ 2a315829
This diff is collapsed.
init/compile/croco 0 → 120000
View file @ 328630be
../../compile/croco
\ No newline at end of file
init/param_inputs 0 → 120000
View file @ 328630be
../param_inputs
\ No newline at end of file
init/scripts 0 → 120000
View file @ 328630be
../scripts
\ No newline at end of file
scripts/IRENE.cpu_info.sh 0 → 100755
View file @ 328630be
#!/bin/bash
# argument: jobid
# if the job is running, the job number is in the SLURM_JOBID shell variable
verbose=false
if [ -z ${SLURM_JOBID+x} ]; then
running=false
else
running=true
fi
printf "\nrunning = ${running}\n"
printf "verbose = ${verbose}\n"
printf "\n pour avoir des infos sur un job en cours d'execution : \n"
printf " ccc_mpp -u ${USER}\n"
printf " avec 'ccc_mpp -h' la liste des options disponibles\n"
printf "\n pour avoir des infos sur un job pendant ou après : \n"
printf " ccc_macct JOBID\n"
printf "\n pour avoir des infos l'occupation et composition de la machine : \n"
printf " ccc_mpinfo\n"
if [ "$#" == "1" ]; then
JOBID2=$1
printf "\nJOBID = ${JOBID2}\n"
echo ""
echo "> ccc_mpp -n -u ${USER}"
ccc_mpp -n -u ${USER} # -n : prints results without colors to avoid printing problem in the output file
echo ""
echo "> ccc_macct ${JOBID2}"
ccc_macct ${JOBID2}
echo ""
echo ""
else
printf "\n\n\n Passez le jobid en argument!! \n\n\n\n"
fi
scripts/IRENE.env
View file @ 328630be
......@@ -10,7 +10,7 @@ export STOREDIR=${CCCSTOREDIR}
#-------------------------------------------------------------------------------
# croco
export CROCO_SOURCE="/ccc/work/cont005/gen1140/hourdinc/locean_croco_pisces/croco_locean_v1.00/OCEAN"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch/${EXP_NAME}${TEST_NAME}"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch"
export MPIF90="mpif90"
export FC="ifort"
export NETCDFLIB="\$(nf-config --flibs)"
......
scripts/IRENE.header
View file @ 328630be
......@@ -12,17 +12,20 @@
#MSUB -j oe
Nodes: 1 656
Total cores: 79 488
#======= IreneSKL (skylake)
### CPUs: 2x24-cores Intel Skylake@2.7GHz (AVX512) Cores/Node: 48
### RAM/Core: 3.75GB => RAM/Node: 180GB
### >ccc_mpinfo
### --------------CPUS------------ -------------NODES------------
### PARTITION STATUS TOTAL DOWN USED FREE TOTAL DOWN USED FREE MpC CpN SpN CpS TpC
### --------- ------ ------ ------ ------ ------ ------ ------ ------ ------ ----- --- --- --- ---
### skylake up 79056 96 78650 310 1647 2 1642 3 3750 48 2 24 1
#MSUB -q skylake
#MSUB -c 1 # number of cores per mpi task
#MSUB -n 96 # Total number of mpi task to use
#MSUB -N 4 # number of nodes to use
#MSUB -n 120 # number of MPI task
#MSUB -c 2 # number of threads by MPI task (for OPENMP or to reserve more memory)
# #MSUB -N 4 # number of nodes to use (better to use -c option to reserve more memory)
#MSUB -x # requests exclusive usage of allocated nodes.
#MSUB -A gen1140
......@@ -30,11 +33,19 @@ Total cores: 79 488
#======= Reserve Time CPU
#======= Test Queue
# #MSUB -Q test # 1800 s max
# #MSUB -T 1800
#======= Production Queue
#MSUB -T 14400 # 4 hours for 144 cores & 6 nodes (can11sen2cp)
#------- Test Queue
#MSUB -Q test # 1800 s max
#MSUB -T 1800
#------ Production Queue
# can11sen2cp : (parent) LLm0=224, MMm0=288, N=50 (children) LLm0=200, MMm0=300, N=50
# ~ 07h40mn for agrif/pisces | pdt=400 | 96 cores/ 4 nodes
# ~ 05h20mn for agrif/pisces | pdt=600 | 96 cores/ 4 nodes
# #MSUB -T 14400 # 4 hours
# #MSUB -T 28800 # 8 hours
# #MSUB -T 72000 # 20 hours
#======= Various
......@@ -47,13 +58,17 @@ Total cores: 79 488
#===============================================================================
umask 022
#set -u
set +x # (because set -x by defult on Irene)
module unload netcdf-fortran netcdf-c hdf5
echo ""
echo "date_chris : `date "+%Y%m%d-%H:%M:%S"`"
module purge
module load netcdf-fortran/4.4.4
module load netcdf-c/4.6.0
module load mpi/openmpi/2.0.4
scripts/JEAN-ZAY.env
View file @ 328630be
......@@ -10,7 +10,7 @@ export STOREDIR=${STORE}
#-------------------------------------------------------------------------------
# croco
export CROCO_SOURCE="/gpfswork/rech/eee/reee084/locean_croco_pisces/croco_locean_v1.00/OCEAN"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch/${EXP_NAME}${TEST_NAME}"
export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch"
export MPIF90="mpiifort"
export FC="ifort"
export NETCDFLIB="-lnetcdff -lnetcdf"
......
scripts/JEAN-ZAY.header
View file @ 328630be
......@@ -67,27 +67,12 @@
umask 022
set -u
echo ""
echo "date_chris : `date "+%Y%m%d-%H:%M:%S"`"
#===============================================================================
#if ! [ -z ${SLURM_JOB_ID+x} ]; then
# echo ""
# echo "date_chris : `date "+%Y%m%d-%H:%M:%S"`"
# echo "scontrol show job ${SLURM_JOB_ID}"
# scontrol show job ${SLURM_JOB_ID}
# printf "\n\n\n\n"
#
#fi
#===============================================================================
module unload intel-compilers intel-mpi
module purge
module load intel-compilers/19.0.4
module load intel-mpi/19.0.4
module unload netcdf-fortran netcdf
module load netcdf-fortran/4.5.2-mpi
module load netcdf/4.7.2-mpi
......
scripts/common_definitions.sh
View file @ 328630be
......@@ -3,8 +3,6 @@
#-------------------------------------------------------------------------------
# Default values
#-------------------------------------------------------------------------------
export MACHINE_STOCKAGE=""
#export MACHINE_STOCKAGE="ssh gaya"
#-------------------------------------------------------------------------------
# Common functions
......
scripts/compile_oce.sh
View file @ 328630be
......@@ -3,6 +3,15 @@
set -u
# UNE SEULE COMPILATION A LA FOIS!!!
test_comp=`ps -alef | grep $USER | grep jobcom | grep -v grep`
if [ "${test_comp}" != "" ] ; then
printf "\n\n another compilation is running. Please wait... \n "
printf "\n\n ${test_comp} \n\n\n " && exit 1
fi
. ./namelist_period.sh
. ./namelist_exp.sh
. ./${COMPUTER}.env
......@@ -54,14 +63,11 @@ sed -e "s|<script_key_openmp>|${def_OPENMP}|" \
cppdefs.base.h > cppdefs.h
exec &> >(tee ${COMPDIR}/../croco_compile_listing.txt)
cd ${COMPDIR}/..
export CROCO_LAST="croco${TEST_NAME}_last_${COMPUTER}"
export CROCO_LAST="croco_last_${COMPUTER}"
[ -d ${CROCO_LAST} ] && test_diff=`diff -r -x *.swp croco ${CROCO_LAST}`
[ -d ${CROCO_LAST} ] && test_diff=`diff -r -x *.swp -x croco_compile_listing.txt croco ${CROCO_LAST}`
echo ""
echo "CROCO_LAST = ${CROCO_LAST}"
......@@ -69,14 +75,18 @@ echo ""
if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "" ] ); then
exec &> >(tee ${COMPDIR}/croco_compile_listing.txt)
if ! [ -d ${CROCO_LAST} ] ; then
echo "----------------------------------------------------------------------"
echo " First compilation... "
echo "----------------------------------------------------------------------"
echo ""
mkdir -p ${CROCO_SCRATCH}
elif [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "" ] ; then
# DATE1=`date "+%Y%m%d-%H_%M_%S"`
CROCO_LAST_OLD="${EXPDIR}/compile/${CROCO_LAST}_${OLD}"
printf "\n\n\n\n######################################################################\n"
echo "----------------------------------------------------------------------"
echo " Differences with the last compilation :"
echo "----------------------------------------------------------------------"
......@@ -85,9 +95,9 @@ if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "
echo " sav old compile dir in ${CROCO_LAST_OLD}"
echo ""
mv ${CROCO_LAST} ${CROCO_LAST_OLD}
printf "######################################################################\n\n\n\n"
fi
! [ -d ${CROCO_SCRATCH} ] && mkdir -p ${CROCO_SCRATCH}
echo "*****************************************************************"
echo "* MODULES *"
......@@ -121,9 +131,6 @@ if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "
git status
echo ""
cd - > /dev/null 2>&1
echo ""
echo "----------------------------------------------------------------------"
echo " "
......@@ -138,21 +145,23 @@ if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "
echo "* COMPILATION *"
echo "*****************************************************************"
rm -f croco/croco
rm -f croco/croco_*.exe
cd ${COMPDIR}
[ -f croco ] && rm -f croco
[ -h croco_${COMPUTER}.exe ] && rm -f croco_${COMPUTER}.exe
echo "----------------------------------------------------------------------"
echo " compiling... "
echo "----------------------------------------------------------------------"
echo " compile directory: ${COMPDIR}"
echo " compile directory: `pwd`"
echo ""
cd ${COMPDIR}; time jobcomp
cd ..
if [ -f croco/croco ] ; then
ln -s croco croco/croco_${COMPUTER}.exe
mv -f croco_compile_listing.txt croco
rsync -a croco/* ${CROCO_LAST}
time jobcomp
if [ -f croco ] ; then
ln -s croco croco_${COMPUTER}.exe
rsync -a * ../${CROCO_LAST}
else
mv -f croco_compile_listing.txt croco
echo ""
echo "----------------------------------------------------------------------"
echo " ERROR !!! compilation aborted!! "
......
scripts/getrst_oce.sh
View file @ 328630be
......@@ -16,8 +16,8 @@ do
if [ ${AGRIFZ} -eq 0 ]; then # AGRIF=false
lnfile ${INDIR}/ini/can11_rst_bio_fromcan11bio1.nc${suff} croco_ini.nc${suff}
else # AGRIF=true
# lnfile ${INDIR}/ini/can11sen2_rst_bio_rstphy8year.nc${suff} croco_ini.nc${suff}
lnfile ${INDIR}/ini/can11sen2_rst_bio.nc${suff} croco_ini.nc${suff}
lnfile ${INDIR}/ini/can11sen2_rst_bio_rstphy8year.nc${suff} croco_ini.nc${suff}
# lnfile ${INDIR}/ini/can11sen2_rst_bio.nc${suff} croco_ini.nc${suff}
fi
else
lnfile ${RSTDIR_IN}/restart_oce_${EXP_NAME}_*.nc${suff} croco_ini.nc${suff}
......
scripts/job.base.sh
View file @ 328630be
......@@ -9,25 +9,37 @@ export EXEDIR="${EXEDIR_ROOT}/${EXP_NAME}/${ROOT_NAME_2}"
export OUTDIR="${OUTDIR_ROOT}/${EXP_NAME}/${ROOT_NAME_2}"
export RSTDIR_OUT="${RSTDIR_ROOT}/${EXP_NAME}/${ROOT_NAME_3}"
# EXEDIR: Execution directory
[ -d ${EXEDIR} ] && mv ${EXEDIR} ${EXEDIR}_${OLD}
mkdir -p ${EXEDIR} && mkdir ${EXEDIR}/ls_l
mkdir -p ${EXEDIR}
# JOBDIR: job directory
[ -d ${JOBDIR} ] && mv ${JOBDIR} ${JOBDIR}_${OLD}
mkdir -p ${JOBDIR}
${MODE_TEST} && mv ${ASCII_DIR_IMG} ${JOBDIR}/${ASCII_DIR_IMG_ROOT}
if ! ${MODE_TEST} ; then
if [ -h ${DATE_BEGIN_JOB}_${DATE_END_JOB}_${ASCII_DIR_IMG_ROOT} ]; then
rm -f ${DATE_BEGIN_JOB}_${DATE_END_JOB}_${ASCII_DIR_IMG_ROOT}
ln -s ${DATE_BEGIN_JOB}_${DATE_END_JOB}_${OLD}/${ASCII_DIR_IMG_ROOT} ${DATE_BEGIN_JOB}_${DATE_END_JOB}_${OLD}_${ASCII_DIR_IMG_ROOT}
fi
fi
if ! [ -h ${ASCII_DIR_IMG} ] && [ -d ${ASCII_DIR_IMG} ] ; then
mv ${ASCII_DIR_IMG} ${JOBDIR}/${ASCII_DIR_IMG_ROOT}
if ! ${MODE_TEST} ; then
ln -s ${DATE_BEGIN_JOB}_${DATE_END_JOB}/${ASCII_DIR_IMG_ROOT} ${ASCII_DIR_IMG_ROOT}
ln -s ${DATE_BEGIN_JOB}_${DATE_END_JOB}/${ASCII_DIR_IMG_ROOT} ${DATE_BEGIN_JOB}_${DATE_END_JOB}_${ASCII_DIR_IMG_ROOT}
fi
fi
# OUTDIR: output directory
${MACHINE_STOCKAGE} ls ${OUTDIR} > /dev/null 2>&1
[ "$?" -eq "0" ] && ${MACHINE_STOCKAGE} mv ${OUTDIR} ${OUTDIR}_${OLD}
${MACHINE_STOCKAGE} mkdir -p ${OUTDIR}
[ -d ${OUTDIR} ] && mv ${OUTDIR} ${OUTDIR}_${OLD}
mkdir -p ${OUTDIR}
# RSTDIR_OUT: restart directory
${MACHINE_STOCKAGE} ls ${RSTDIR_OUT} > /dev/null 2>&1
[ "$?" -eq "0" ] && ${MACHINE_STOCKAGE} mv ${RSTDIR_OUT} ${RSTDIR_OUT}_${OLD}
${MACHINE_STOCKAGE} mkdir -p ${RSTDIR_OUT}
[ -d ${RSTDIR_OUT} ] && mv ${RSTDIR_OUT} ${RSTDIR_OUT}_${OLD}
mkdir -p ${RSTDIR_OUT}
......@@ -74,7 +86,7 @@ if [ ${LOADL_STEP_NAME} == "get_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
# for file in ${PARAMDIR}/* ; do cpfile ${file} . ; done; chmod 755 *.sh
# echo ""
### get model files
### get models
echo "get model files :"
${USE_OCE} && cpfile ${COMPDIR}/${MODEL_OCE}_${COMPUTER}.exe .
${USE_ATM} && cpfile ${COMPDIR}/${MODEL_ATM} .
......@@ -91,9 +103,9 @@ if [ ${LOADL_STEP_NAME} == "get_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
. ./getfile_oce.sh
echo ""
echo "get ocean restart files :" |tee ls_l/getrst_oce.txt
echo "see listing in ${EXEDIR}/ls_l/getrst_oce.txt"
. ./getrst_oce.sh >> ls_l/getrst_oce.txt
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 ""
fi
......@@ -125,8 +137,8 @@ if [ ${LOADL_STEP_NAME} == "run_model" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; the
cd ${EXEDIR}
ls -l > ls_l/ls_pre_exe.txt
echo "see ls -l in ${EXEDIR}/ls_l/ls_pre_exe.txt"
ls -l > listing_ls_pre_exe.txt
echo "see ls -l in ${EXEDIR}/listing_ls_pre_exe.txt"
echo "date_chris : `date "+%Y%m%d-%H:%M:%S"`"
echo ""
......@@ -137,8 +149,8 @@ if [ ${LOADL_STEP_NAME} == "run_model" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; the
echo ""
echo "date_chris : `date "+%Y%m%d-%H:%M:%S"`"
echo "see ls -l in ${EXEDIR}/ls_l/ls_post_exe.txt"
ls -l > ls_l/ls_post_exe.txt
echo "see ls -l in ${EXEDIR}/listing_ls_post_exe.txt"
ls -l > listing_ls_post_exe.txt
echo ""
fi # Step2
......@@ -157,16 +169,16 @@ if [ ${LOADL_STEP_NAME} == "put_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
cd ${EXEDIR}
if ${USE_OCE} ; then
echo "put ocean restart & output files :" | tee ls_l/putfile_oce.txt
echo "see listing in ${EXEDIR}/ls_l/putfile_oce.txt"
. ${SCRIPTDIR}/putfile_oce.sh >> ls_l/putfile_oce.txt
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 ""
fi
if ${USE_ATM} ; then
echo "put atmosphere restart & output files :" | tee ls_l/putfile_oce.txt
echo "see listing in ${EXEDIR}/ls_l/putfile_atm.txt"
. ${SCRIPTDIR}/putfile_atm.sh >> ls_l/putfile_atm.txt
echo "put atmosphere restart & output files :" | tee listing_putfile_oce.txt
echo "see listing in ${EXEDIR}/listing_putfile_atm.txt"
. ${SCRIPTDIR}/putfile_atm.sh >> listing_putfile_atm.txt
echo ""
fi
......@@ -178,7 +190,7 @@ if [ ${LOADL_STEP_NAME} == "put_file" ] || [ ${LOADL_STEP_NAME} == "XXX" ]; then
# FILES_JOB="${jobname} ${listing_root_name}*"
# cd ${JOBDIR_ROOT}; for file in ${FILES_JOB}; do mvfile2 ${file} ${JOBDIR}; done; cd -; echo "";
cd ${JOBDIR_ROOT}