Changeset 1585 for branches/libIGCM_CESMEP/libIGCM_config

Timestamp:

04/25/23 14:26:44 (12 months ago)

Author:

ssenesi

Message:

merge branch libIGCM_CESMEP with trunk that handles RedHat8 on Irene

File:

• branches/libIGCM_CESMEP/libIGCM_config/libIGCM_config.ksh (modified) (3 diffs)

branches/libIGCM_CESMEP/libIGCM_config/libIGCM_config.ksh

@@ -111 +111 @@
   if ( [ ! X${config_UserChoices_SpaceName} = X ] && [ ! X${config_UserChoices_ExperimentName} = X ] ) ; then
     FreeName=$( echo ${config_UserChoices_JobName} | sed 's/.*_//' )
-    if ( [ ! X${config_Ensemble_EnsembleName} = X ] && [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then
-      R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-      R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-      R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-      R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
-      R_CMIP=${CMIP6_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}/${config_Ensemble_EnsembleDate}/${FreeName}
+
+    if ( [ X${config_Post_StorageCMIP} = XSCRATCH ] || [ X${config_Post_StorageCMIP} = Xscratch ] ) ; then
+      IGCM_debug_Print 1 "LIBIGCM CONFIG:: SCRATCH R_BUF=${R_BUF}"
+      StoreCMIP=${R_BUF}
+    elif ( [ X${config_Post_StorageCMIP} = XSTORE ] || [ X${config_Post_StorageCMIP} = Xstore ] ) ; then
+      IGCM_debug_Print 1 "LIBIGCM CONFIG:: SCRATCH R_OUT=${R_OUT}"
+      StoreCMIP=${R_OUT}
+    else
+      IGCM_debug_Print 1 "LIBIGCM CONFIG:: ELSE CMIP_BUF=${CMIP6_BUF}"
+      StoreCMIP=${CMIP6_BUF}
+    fi
+    # Ensemble cases (default all members outputs in same directory)
+    if ( [ ! X${config_Ensemble_EnsembleName} = X ] ) ; then
+      R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}
+      R_FIGR=${R_FIG}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}
+      R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}
+      R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}
+      R_CMIP=${StoreCMIP}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${config_Ensemble_EnsembleName}
+      IGCM_debug_Print 1 "LIBIGCM CONFIG:: ENSEMBLE R_CMIP=${R_CMIP}"
+
+      # PERTURB Ensemble Outputs
+      if ( [ X${config_Ensemble_EnsembleType} = XEns_PERTURB ] ) ; then
+        if ( [ ! X${config_Ensemble_EnsembleDate} = X ] ) ; then
+          R_SAVE=${R_SAVE}/${config_Ensemble_EnsembleDate}/${FreeName}
+          R_FIGR=${R_FIGR}/${config_Ensemble_EnsembleDate}/${FreeName}
+          R_BUFR=${R_BUFR}/${config_Ensemble_EnsembleDate}/${FreeName}
+          R_DODS=${R_DODS}/${config_Ensemble_EnsembleDate}/${FreeName}
+          R_CMIP=${R_CMIP}/${config_Ensemble_EnsembleDate}/${FreeName}
+        else
+          R_SAVE=${R_SAVE}/${FreeName}
+          R_FIGR=${R_FIGR}/${FreeName}
+          R_BUFR=${R_BUFR}/${FreeName}
+          R_DODS=${R_DODS}/${FreeName}
+          R_CMIP=${R_CMIP}/${FreeName}
+        fi
+      # DATE Ensemble Outputs
+      elif ( [ X${config_Ensemble_EnsembleType} = XEns_DATE ] ) ; then
+        R_FIGR=${R_FIGR}/${FreeName}
+        R_BUFR=${R_BUFR}/${FreeName}
+        R_DODS=${R_DODS}/${FreeName}
+        IGCM_debug_Print 1 "LIBIGCM CONFIG:: ENSEMBLE DATE R_CMIP=${R_CMIP}"
+        if ( [ X${config_Ensemble_EnsembleMergeSave} = X ] || [ X${config_Ensemble_EnsembleMergeSave} = Xn ] || 
+             [ X${config_Ensemble_EnsembleMergeSave} = Xno ] ) ; then
+          # One SAVE directory per member, else common output dir for all members
+          R_SAVE=${R_SAVE}/${FreeName}
+          R_CMIP=${R_CMIP}/${FreeName}
+          IGCM_debug_Print 1 "LIBIGCM CONFIG:: ENSEMBLE DATE MERGE R_CMIP=${R_CMIP}"
+        fi
+      fi
     else
       R_SAVE=${R_OUT}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
@@ -122 +165 @@
       R_BUFR=${R_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
       R_DODS=${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
-      R_CMIP=${CMIP6_BUF}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
+      R_CMIP=${StoreCMIP}/${config_UserChoices_TagName}/${config_UserChoices_SpaceName}/${config_UserChoices_ExperimentName}/${FreeName}
     fi
   else
@@ -137 +180 @@
     fi
   fi
-
+  
+  IGCM_debug_Print 1 "LIBIGCM CONFIG:: R_CMIP = ${R_CMIP}"
+  
   #====================================================
   # Define R_OUT_KSH : Storage place for job output