minor changes

bin/expdel

+#!/bin/sh  
+
+ printf "\n\n   remove $1 \n\n"
+
+echo "rm -rf  ${EXPDIR}/$1"
+      rm -rf  ${EXPDIR}/$1
+echo "rm -rf  ${EXEDIR}/$1"
+      rm -rf  ${EXEDIR}/$1
+echo "rm -rf  ${OUTDIR}/$1"
+      rm -rf  ${OUTDIR}/$1
+echo "rm -rf  ${RSTDIR}/$1"
+      rm -rf  ${RSTDIR}/$1
+echo""
+echo""
+
+
+

bin/jobdiff

@@ -3,7 +3,7 @@
 
 
 printf "\n colordiff -r  $1/$3 \n      $2/$3      \n     $3\n\n" 
-colordiff -r -x croco_compile_listing.txt $1/$3 $2/$3
+colordiff -r -b -w -x croco_compile_listing.txt $1/$3 $2/$3
 #colordiff -r -x croco_compile_listing.txt -x croco_scratch $1/$3 $2/$3
 
 #printf "\n diff $1/init \n      $2/init \n\n" > jobdiff.out.txt

bin/testdel

-#!/bin/sh  
-
- printf "\n\n   remove $1 \n\n"
-
-echo "rm -rf  ${EXPDIR}/${EXPER}/jobs/$1"
-      rm -rf  ${EXPDIR}/${EXPER}/jobs/$1
-echo "rm -rf  ${EXEDIR}/$1"
-      rm -rf  ${EXEDIR}/$1
-echo "rm -rf  ${OUTDIR}/$1"
-      rm -rf  ${OUTDIR}/$1
-rst1=`echo $1 | cut -c 10-`
-echo "rm -rf  ${RSTDIR}/${rst1}"
-      rm -rf  ${RSTDIR}/${rst1}
+#!/bin/sh 
+
+printf "\n\n   REMOVE $1 \n\n"
+
+printf "\nrm -rf  ${EXPDIR}/${EXPER}/jobs/$1"
+          rm -rf  ${EXPDIR}/${EXPER}/jobs/$1
+
+printf "\nrm -rf  ${EXEDIR}/$1"
+          rm -rf  ${EXEDIR}/$1
+
+printf "\nrm -rf  ${OUTDIR}/$1"
+          rm -rf  ${OUTDIR}/$1
+
+if [  -d "${RSTDIR}/$1" ] ; then
+   printf "\nrm -rf  ${RSTDIR}/$1"
+             rm -rf  ${RSTDIR}/$1
+fi
+
+if [ ${#1} -ge 10 ] ; then
+   rst1=`echo $1 | cut -c 10-`
+   if [  -d "${RSTDIR}/${rst1}" ] ; then
+      printf "\nrm -rf  ${RSTDIR}/${rst1}"
+                rm -rf  ${RSTDIR}/${rst1}
+   fi
+fi
 echo""
 echo""
 

bin/testrename

 #!/bin/sh 
 
+printf "\n\n   RENAME $1 \n          $2\n\n"
 
+printf "\nmv  ${EXPDIR}/${EXPER}/jobs/$1 \n    ${EXPDIR}/${EXPER}/jobs/$2\n"
+          mv  ${EXPDIR}/${EXPER}/jobs/$1       ${EXPDIR}/${EXPER}/jobs/$2
 
-printf "\n\n   rename $1 \n          $2\n\n"
+printf "\nmv  ${EXEDIR}/$1 \n    ${EXEDIR}/$2\n"
+          mv  ${EXEDIR}/$1       ${EXEDIR}/$2 
 
-printf "mv  ${EXPDIR}/${EXPER}/jobs/$1 \n    ${EXPDIR}/${EXPER}/jobs/$2\n\n"
-        mv  ${EXPDIR}/${EXPER}/jobs/$1       ${EXPDIR}/${EXPER}/jobs/$2
-printf "mv  ${EXEDIR}/$1 \n    ${EXEDIR}/$2\n\n"
-        mv  ${EXEDIR}/$1       ${EXEDIR}/$2 
-printf "mv  ${OUTDIR}/$1 \n    ${OUTDIR}/$2\n\n"
-        mv  ${OUTDIR}/$1       ${OUTDIR}/$2 
-rst1=`echo $1 | cut -c 10-`
-rst2=`echo $2 | cut -c 10-`
-printf "mv  ${RSTDIR}/${rst1} \n    ${RSTDIR}/${rst2}\n\n"
-        mv  ${RSTDIR}/${rst1}       ${RSTDIR}/${rst2}
+printf "\nmv  ${OUTDIR}/$1 \n    ${OUTDIR}/$2\n"
+          mv  ${OUTDIR}/$1       ${OUTDIR}/$2 
+
+if [  -d "${RSTDIR}/$1" ] ; then
+   printf "\nmv  ${RSTDIR}/$1 \n    ${RSTDIR}/$2\n"
+             mv  ${RSTDIR}/$1       ${RSTDIR}/$2
+fi
+
+if [ ${#1} -ge 10 ] ; then
+   rst1=`echo $1 | cut -c 10-`
+   if [  -d "${RSTDIR}/${rst1}" ] ; then
+      printf "\nmv  ${RSTDIR}/${rst1} \n    ${RSTDIR}/$2\n"
+                mv  ${RSTDIR}/${rst1}       ${RSTDIR}/$2
+   fi
+fi
+echo""
+echo""
 
 
 

scripts/JEAN-ZAY.env

@@ -14,7 +14,7 @@ export CROCO_SCRATCH="${SCRATCHDIR}/croco_scratch"
 export MPIF90="mpiifort"
 export FC="ifort"
 #export IFORT_FFLAGS1="-O3 -fno-alias -i4 -r8 -fp-model precise" # production
-export IFORT_FFLAGS1="-check bounds -fpe0 -traceback -g -O0 -ftrapuv -72 -fno-alias -i4 -r8 -fp-model precise -mcmodel=medium" # debug Steph Mars 2021
+ export IFORT_FFLAGS1="-check bounds -fpe0 -traceback -g -O0 -ftrapuv -72 -fno-alias -i4 -r8 -fp-model precise -mcmodel=medium" # debug Steph Mars 2021
 #export IFORT_FFLAGS1="-O0 -g -i4 -r8 -traceback -check all -check bounds -check uninit -CA -CB -CS -ftrapuv -fpe1" # debug jobcomp v2.00_orig
 export NETCDFLIB="-lnetcdff -lnetcdf"
 export NETCDFINC=""
@@ -41,7 +41,7 @@ fi
  export EXEDIR_ROOT="${SCRATCHDIR}/${CONFIG}/execute"
 
 #-------------------------------------------------------------------------------
-#  Store Directory for output/restart files
+#  Directories
 #-------------------------------------------------------------------------------
 export OUTDIR_ROOT="${SCRATCHDIR}/${CONFIG}/outputs"
 export RSTDIR_ROOT="${SCRATCHDIR}/${CONFIG}/restarts"

scripts/compile_oce.sh

@@ -87,16 +87,18 @@ if ( ! [ -d ${CROCO_LAST} ] ) || ( [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "
       echo ""
       mkdir -p ${CROCO_SCRATCH}
    elif [ -d ${CROCO_LAST} ] && [ "${test_diff}" != "" ] ; then
-      CROCO_LAST_OLD="${EXPDIR}/compile/${CROCO_LAST}_${OLD}"
+#     CROCO_LAST_OLD="${EXPDIR}/compile/${CROCO_LAST}_${OLD}"
       printf "\n\n\n\n######################################################################\n"
       echo "----------------------------------------------------------------------"
       echo " Differences with the last compilation :"       
       echo "----------------------------------------------------------------------"
       echo "${test_diff}"
       echo ""
-      echo "   sav old compile dir in ${CROCO_LAST_OLD}"
+#     echo "   sav old compile dir in ${CROCO_LAST_OLD}"
       echo ""
-      mv ${CROCO_LAST} ${CROCO_LAST_OLD}
+#     mv ${CROCO_LAST} ${CROCO_LAST_OLD}
+      [ -d ${CROCO_LAST} ] && rm -rf ${CROCO_LAST}_old
+      mv ${CROCO_LAST} ${CROCO_LAST}_old
       printf "######################################################################\n\n\n\n"
    fi
 

scripts/namelist_exp.sh

@@ -35,7 +35,7 @@ export MODE_TEST=true   #  for running different tests in the same exp with diff
 #  export TEST_NAME="_test_avec_AGRIF_6x24_undef_BIO_HADV_WENO5"
 #  export TEST_NAME="_verif_croco.in_v2.00-THETA_B_0.00"
 #  export TEST_NAME="_001_verif"
-#  export TEST_NAME="_bench01_agrif_pisces_2tsp-options_OPTIM"
+#  export TEST_NAME="_bench01_agrif_pisces_2tsp_options_OPTIM"
    export TEST_NAME="_bench01_agrif_pisces_2tsp_options_DEBUG"
 
 export TEST_SCRIPT=false       #  the job is not submited