Changeset 1623

Timestamp:

01/24/24 16:39:14 (3 months ago)

Author:

nillod

Message:

Bug fix for ensemble tools introduce by new functionalities.

Location:

trunk/libIGCM

Files:

• ins_job (modified) (2 diffs)
• libIGCM_ensemble/libIGCM_ensemble.ksh (modified) (3 diffs)

trunk/libIGCM/ins_job

@@ -660 +660 @@
   #.. Read input data from ensemble.card ..
   SUBMIT_DIR=${SUBMIT_DIR_ENS}
-  RUN_DIR="${CCCWORKDIR}/ENSEMBLE_TMP"
+  if [ X"${SYSTEM}" == "Xirene" ] ; then
+    RUN_DIR="${CCCWORKDIR}/ENSEMBLE_TMP"
+  elif [ X"${SYSTEM}" == "Xirene-amd" ] ; then
+    RUN_DIR="${CCCWORKDIR}/ENSEMBLE_TMP"
+  elif [ X"${SYSTEM}" == "Xjeanzay" ] ; then
+    RUN_DIR="${WORK}/ENSEMBLE_TMP"
+  else
+    RUN_DIR="${WORK}/ENSEMBLE_TMP"
+  fi
   #
   # Copy initial things around and define variables (hindcast/forecast case)
@@ -696 +704 @@
 #
 # Only do this if we are in a folder containing a config.card (conf_card=yes)
-if [ ${conf_card} == yes ] ; then
+if ([ ${conf_card} == yes ] && [ ${x_e} != 'true' ] ); then
 
     [[ ${new_struct} == yes ]] && prefix="$JobName/"  

trunk/libIGCM/libIGCM_ensemble/libIGCM_ensemble.ksh

@@ -150 +150 @@
   IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card Ensemble EnsembleDate ${HumanDateBegin}
   IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card Ensemble EnsembleType "Ens_${EnsembleType}"
+  if [ X${ensemble_Ens_DATE_MERGE_SAVE} != "X" ] ; then
+          IGCM_debug_Print 1 "DATE MERGE SAVE filled to : ${ensemble_Ens_DATE_MERGE_SAVE}"
+  else
+          IGCM_debug_Print 1 "DATE MERGE SAVE is EMPTY, filled to : n"
+          ensemble_Ens_DATE_MERGE_SAVE="n"
+  fi
   IGCM_card_WriteOption ${SUBMIT_DIR}/${StartDir}/${MemberDir}/config.card Ensemble EnsembleMergeSave ${ensemble_Ens_DATE_MERGE_SAVE}
   
@@ -352 +358 @@
     IGCM_date_GetYearMonth ${DateBegin} year month
 
+    echo "New DateBegin = $DateBegin"
+    echo "========================================================================"
+
   # - Determine number of day(s) in PERIODICITY
     PeriodLengthInDays=$( IGCM_date_DaysInCurrentPeriod ${DateBegin} ${ensemble_Ens_PERTURB_PERIODICITY} )
@@ -432 +441 @@
       ;;
     esac
-    echo "New DateBegin = $DateBegin"
-    echo "========================================================================"
   done
+  IGCM_debug_Print 1 "End of periodic perturbol loop, use dDateBegin=${oldDateBegin}"
+  DateBegin=${oldDateBegin}
+  
   IGCM_debug_PopStack "IGCM_ensemble_CastPeriodicStarts"
 }