remove wcoss2 part

ufs-community · Jan 17, 2025 · 813f1bd · 813f1bd
1 parent 1b8f6c9
commit 813f1bd
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 72 deletions.
diff --git a/jobs/JLANDDA_ANALYSIS b/jobs/JLANDDA_ANALYSIS
@@ -62,13 +62,9 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-fi
+
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
 
 mkdir -p ${COMOUT}
 export COMOUThofx="${COMOUThofx:-${COMOUT}/hofx}"

diff --git a/jobs/JLANDDA_FCST_IC b/jobs/JLANDDA_FCST_IC
@@ -62,20 +62,13 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMINgdas="${COMINgdas:-$(compath.py ${envir}/gdas/${gdas_ver})}"
-  export COMINgfs="${COMINgfs:-$(compath.py ${envir}/gfs/${gfs_ver})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMINgdas="${COMINgdas:-${FIXlandda}/DATA_gdas}"
-  export COMINgfs="${COMINgfs:-${FIXlandda}/DATA_gfs}"
-fi
 
-mkdir -p ${COMOUT}
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMINgdas="${COMINgdas:-${FIXlandda}/DATA_gdas}"
+export COMINgfs="${COMINgfs:-${FIXlandda}/DATA_gfs}"
 
+mkdir -p ${COMOUT}
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JLANDDA_FORECAST b/jobs/JLANDDA_FORECAST
@@ -62,15 +62,10 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMINm1="${COMINm1:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDYm1})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMINm1="${COMINm1:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDYm1}}"
-fi
+
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMINm1="${COMINm1:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDYm1}}"
 
 mkdir -p ${COMOUT}
 
@@ -83,7 +78,6 @@ mkdir -p ${COMOUTplot}
 # Create a teomporary share directory
 export DATA_RESTART="${DATA_RESTART:-${DATAROOT}/DATA_SHARE/RESTART}"
 mkdir -p ${DATA_RESTART}
-
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JLANDDA_JCB_TEST b/jobs/JLANDDA_JCB_TEST
@@ -62,16 +62,11 @@ export cycle="${cycle:-t${cyc}z}"
 #. ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-fi
 
-mkdir -p ${COMOUT}
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
 
+mkdir -p ${COMOUT}
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JLANDDA_PLOT_STATS b/jobs/JLANDDA_PLOT_STATS
@@ -62,13 +62,9 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-fi
+
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
 
 mkdir -p ${COMOUT}
 export COMOUTplot="${COMOUTplot:-${COMOUT}/plot}"

diff --git a/jobs/JLANDDA_POST_ANAL b/jobs/JLANDDA_POST_ANAL
@@ -62,20 +62,15 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-fi
+
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
 
 mkdir -p ${COMOUT}
 
 # Create a teomporary share directory
 export DATA_RESTART="${DATA_RESTART:-${DATAROOT}/DATA_SHARE/RESTART}"
 mkdir -p ${DATA_RESTART}
-
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JLANDDA_PREP_OBS b/jobs/JLANDDA_PREP_OBS
@@ -62,20 +62,15 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-fi
+
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
 
 mkdir -p ${COMOUT}
 export COMOUTobs=${COMOUTobs:-${COMOUT}/obs}
 mkdir -p ${COMOUTobs}
 export COMOUTplot="${COMOUTplot:-${COMOUT}/plot}"
 mkdir -p ${COMOUTplot}
-
 #
 #-----------------------------------------------------------------------
 #

diff --git a/jobs/JLANDDA_PRE_ANAL b/jobs/JLANDDA_PRE_ANAL
@@ -62,20 +62,15 @@ setpdy.sh
 . ./PDY
 
 [[ "$WORKFLOW_MANAGER" = "rocoto" ]] && export COMROOT=$COMROOT
-if [ "${MACHINE}" = "wcoss2" ]; then
-  export COMIN="${COMIN:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-  export COMOUT="${COMOUT:-$(compath.py -o ${NET}/${model_ver}/${RUN}.${PDY})}"
-else
-  export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-  export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
-fi
+
+export COMIN="${COMIN:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
+export COMOUT="${COMOUT:-${COMROOT}/${NET}/${model_ver}/${RUN}.${PDY}}"
 
 mkdir -p ${COMOUT}
 
 # Create a teomporary share directory
 export DATA_RESTART="${DATA_RESTART:-${DATAROOT}/DATA_SHARE/RESTART}"
 mkdir -p ${DATA_RESTART}
-
 #
 #-----------------------------------------------------------------------
 #

diff --git a/parm/detect_platform.sh b/parm/detect_platform.sh
@@ -17,8 +17,6 @@ elif [[ -d /glade ]]; then
   PLATFORM="derecho"
 elif [[ -d /lfs4/HFIP ]] ; then
   PLATFORM="jet"
-elif [[ -d /lfs/h2 ]] ; then
-  PLATFORM="wcoss2"
 else
   PLATFORM="unknown"
 fi

diff --git a/parm/setup_wflow_env.py b/parm/setup_wflow_env.py
@@ -310,8 +310,6 @@ def detect_platform():
         machine = "derecho"
     elif os.path.isdir("/lfs4/HFIP"):
         machine = "jet"
-    elif os.path.isdir("/lfs/h2"):
-        machine = "wcoss2"
     else:
         sys.exit(f"Machine (platform) is not detected. Please set it with -p argument")