From 7fa414154996760f8d80cdeec9914646b590acbf Mon Sep 17 00:00:00 2001
From: abishekg7 <agopal@tamu.edu>
Date: Thu, 8 Oct 2020 10:10:18 -0500
Subject: [PATCH] changes to xml defaults

---
 Config/config_postprocess.xml                           | 4 ++--
 cesm_utils/cesm_utils/create_postprocess                | 2 +-
 diagnostics/diagnostics/atm/Config/config_diags_atm.xml | 2 +-
 diagnostics/diagnostics/ice/Config/config_diags_ice.xml | 8 ++++----
 diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml | 4 ++--
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Config/config_postprocess.xml b/Config/config_postprocess.xml
index 446c75de..f7a3fb39 100644
--- a/Config/config_postprocess.xml
+++ b/Config/config_postprocess.xml
@@ -170,8 +170,8 @@
 
       <entry id="TIMESERIES_OUTPUT_ROOTDIR" 
 	     type="string"
-	     valid_values="/glade/scratch/$USER/archive/$CASE, $DOUT_S_ROOT"  
-	     value="$DOUT_S_ROOT" 
+	     valid_values="/glade/scratch/$USER/archive/$CASE, $DOUT_S_ROOT, $PP_CASE_PATH/tseries"  
+	     value="$PP_CASE_PATH/tseries" 
 	     group="postprocess"
 	     desc="Fully-qualified rootdir path to output variable time series data files. Note: [compname]/proc/tseries/[tper] will be appended automatically."
 	     ></entry> 
diff --git a/cesm_utils/cesm_utils/create_postprocess b/cesm_utils/cesm_utils/create_postprocess
index e1bec043..689dd83b 100755
--- a/cesm_utils/cesm_utils/create_postprocess
+++ b/cesm_utils/cesm_utils/create_postprocess
@@ -590,7 +590,7 @@ def initialize_main(envDict, options, standalone):
     # refer to the caseroot that was specified on the command line instead of what
     # is read in the environment as the caseroot may have changed from what is listed
     # in the env xml
-    envDict['CASEROOT'] = caseroot
+    envDict['CASEROOT'] = os.path.abspath(caseroot)
     envDict['POSTPROCESS_PATH'] = pp
 
     envDict['CESM_TAG'] = 'undefined'
diff --git a/diagnostics/diagnostics/atm/Config/config_diags_atm.xml b/diagnostics/diagnostics/atm/Config/config_diags_atm.xml
index ee4f7615..812ad271 100644
--- a/diagnostics/diagnostics/atm/Config/config_diags_atm.xml
+++ b/diagnostics/diagnostics/atm/Config/config_diags_atm.xml
@@ -55,7 +55,7 @@
       <entry id="ATMDIAG_OUTPUT_ROOT_PATH"
              type="char"
              valid_values=""
-             value="$DOUT_S_ROOT/atm/proc"
+             value="$PP_CASE_PATH/proc/atm"
              group="global"
              desc="Postprocessed files output root path."
              ></entry>
diff --git a/diagnostics/diagnostics/ice/Config/config_diags_ice.xml b/diagnostics/diagnostics/ice/Config/config_diags_ice.xml
index 3fb10d19..b56bdd0e 100644
--- a/diagnostics/diagnostics/ice/Config/config_diags_ice.xml
+++ b/diagnostics/diagnostics/ice/Config/config_diags_ice.xml
@@ -140,7 +140,7 @@ Applies to both model and control cases."
   <entry id="ICEDIAG_PATH_CLIMO_CONT"
          type="char"
          valid_values=""
-         value="$ICEDIAG_PATH_CONT/ice/proc/climo/$ICEDIAG_CASE_TO_CONT/"
+         value="$PP_CASE_PATH/proc/ice/climo/$ICEDIAG_CASE_TO_CONT/"
          group="cont_dataset"
          desc="Path to generated cont climos"
          ></entry>
@@ -148,7 +148,7 @@ Applies to both model and control cases."
   <entry id="ICEDIAG_DIAG_ROOT"
          type="char"
          valid_values=""
-         value="$ICEDIAG_PATH_CONT/ice/proc/diag/$ICEDIAG_CASE_TO_CONT/"
+         value="$PP_CASE_PATH/proc/ice/diag/$ICEDIAG_CASE_TO_CONT/"
          group="cont_dataset"
          desc="Path to generated diags."
          ></entry>
@@ -156,7 +156,7 @@ Applies to both model and control cases."
   <entry id="ICEDIAG_PLOT_ROOT"
          type="char"
          valid_values=""
-         value="$ICEDIAG_PATH_CONT/ice/proc/diag/$ICEDIAG_CASE_TO_CONT/web_plots/"
+         value="$PP_CASE_PATH/proc/ice/diag/$ICEDIAG_CASE_TO_CONT/web_plots/"
          group="cont_dataset"
          desc="Path to generated diag web plots (local)."
          ></entry>
@@ -172,7 +172,7 @@ Applies to both model and control cases."
   <entry id="ICEDIAG_VAR_NAME_TYPE_CONT"
            type="char"
            valid_values="CSIM/CICE/SIMIP"
-           value="SIMIP"
+           value="CICE"
            group="cont_dataset"
            desc="OLD for u, v var names. NEW for uvel, vvel var names."
            ></entry>
diff --git a/diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml b/diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml
index 6fc2025c..f32c8fe7 100644
--- a/diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml
+++ b/diagnostics/diagnostics/ocn/Config/config_diags_ocn.xml
@@ -28,7 +28,7 @@
       <entry id="OCNDIAG_TAVGDIR"
 	     type="char"
 	     valid_values=""
-	     value="$DOUT_S_ROOT/ocn/proc/climo.$OCNDIAG_YEAR0.$OCNDIAG_YEAR1"
+	     value="$PP_CASE_PATH/proc/ocn/climo.$OCNDIAG_YEAR0.$OCNDIAG_YEAR1"
 	     group="global"
 	     desc="Local machine directory for climatology files created by the ocn_avg_generator.py. This directory must have write permissions for the user running the postprocessing."
 	     ></entry>
@@ -68,7 +68,7 @@
       <entry id="OCNDIAG_WORKDIR"
 	     type="char"
 	     valid_values=""
-	     value="$DOUT_S_ROOT/ocn/proc/diag_work.$OCNDIAG_YEAR0-$OCNDIAG_YEAR1"
+	     value="$PP_CASE_PATH/proc/ocn/diag_work.$OCNDIAG_YEAR0-$OCNDIAG_YEAR1"
 	     group="global"
 	     desc="Local machine path to OMWG diagnostics working directory."
 	     ></entry>