Eliminate post-script duplication in site files

Author: ceblanton

flow.cylc

@@ -505,10 +505,14 @@
                 ls {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}
                 echo "the contents of {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}/$oname.nc is..."
                 ls {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}/$oname.nc
+                hsmget -v -t -a {{ HISTORY_DIR_REFINED }} -p {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} \
+                    -w $TMPDIR/modify_refineDiag $hsmdate/\*
                 mv -f * $TMPDIR/modify_refineDiag
                 mv -f $TMPDIR/modify_refineDiag/* .
                 rm -rf $TMPDIR/modify_refineDiag
             fi
+            hsmput -v -t -s tar -a {{ HISTORY_DIR_REFINED }} -p {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} \
+                -w $TMPDIR/history_refineDiag $hsmdate
         """
 {# The following section executes refineDiag tasks, whether single or multiple refineDiag paths are given #}
 {# Create a 'macro' function to reduce code repeat #}

site/ppan.cylc

@@ -2,11 +2,12 @@
     [[root]]
         init-script = """
             # stock fre-cli
-            module load fre/{{ FRE_VERSION }}
+            #module load fre/{{ FRE_VERSION }}
 
             # custom user fre-cli
-            #module load conda
+            module load conda
             #conda activate user-fre-cli
+            conda activate fre-cli
             which fre
 
             module load gcp/2.3
@@ -19,6 +20,7 @@
         platform = ppan
         [[[directives]]]
             --comment=xtmp,fre/{{ FRE_VERSION }}
+            --partition=analysis
         [[[environment]]]
             COPY_TOOL=gcp
 
@@ -32,47 +34,17 @@
         pre-script = """
             env
             set -x
+            module load hsm/1.3.0
             module load gcp
+            # needed only for list_ncvars.
+            module load fre-nctools/2024.05.01
             mkdir -p $work $tempCache $refineDiagDir
             hsmget -v -t -a $histDir -p {{ PTMP_DIR }}/$histDir -w $work $hsmdate/\*
             cd $work/$hsmdate
             ls
         """
 {% endif %}
 
-{% if DO_REFINEDIAG %}
-    [[REFINE-DIAG]]
-        post-script = """
-            cd $refineDiagDir
-            if ls *nc; then
-                refinedCount=$(ls -1 *nc | wc -l)
-            else
-                refinedCount=0
-            fi
-            if [[ $refinedCount > 0 ]]; then
-                for file in $(ls -1 *nc); do
-                    list_ncvars.csh -st01234 $file |& tee $CYLC_WORKFLOW_SHARE_DIR/refineDiag.log
-                done
-            else
-                echo ERROR: RefineDiag script did not create any NetCDF files as it was expected to do
-                exit 1
-            fi
-            if [[ -f {{ HISTORY_DIR_REFINED }}/$oname.nc.tar ]]; then
-                echo "the contents of {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} is..."
-                ls {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}
-                echo "the contents of {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}/$oname.nc is..."
-                ls {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}/$oname.nc
-                hsmget -v -t -a {{ HISTORY_DIR_REFINED }} -p {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} \
-                    -w $TMPDIR/modify_refineDiag $hsmdate/\*
-                mv -f * $TMPDIR/modify_refineDiag
-                mv -f $TMPDIR/modify_refineDiag/* .
-                rm -rf $TMPDIR/modify_refineDiag
-            fi
-            hsmput -v -t -s tar -a {{ HISTORY_DIR_REFINED }} -p {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} \
-                -w $TMPDIR/history_refineDiag $hsmdate
-        """
-{% endif %}
-
     [[MAKE-TIMEAVGS]]
         pre-script = module load cdo
 

site/ppan_test.cylc

@@ -103,35 +103,6 @@
                 script_name:$CYLC_TASK_NAME;exp_run_uuid:$CYLC_WORKFLOW_UUID"
             {{ EPMT_POSTAMBLE }}
         """
-        post-script = """
-            cd $refineDiagDir
-            if ls *nc; then
-                refinedCount=$(ls -1 *nc | wc -l)
-            else
-                refinedCount=0
-            fi
-            if [[ $refinedCount > 0 ]]; then
-                for file in $(ls -1 *nc); do
-                    list_ncvars.csh -st01234 $file |& tee $CYLC_WORKFLOW_SHARE_DIR/refineDiag.log
-                done
-            else
-                echo ERROR: RefineDiag script did not create any NetCDF files as it was expected to do
-                exit 1
-            fi
-            if [[ -f {{ HISTORY_DIR_REFINED }}/$oname.nc.tar ]]; then
-                echo "the contents of {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} is..."
-                ls {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}
-                echo "the contents of {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}/$oname.nc is..."
-                ls {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }}/$oname.nc
-                hsmget -v -t -a {{ HISTORY_DIR_REFINED }} -p {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} \
-                    -w $TMPDIR/modify_refineDiag $hsmdate/\*
-                mv -f * $TMPDIR/modify_refineDiag
-                mv -f $TMPDIR/modify_refineDiag/* .
-                rm -rf $TMPDIR/modify_refineDiag
-            fi
-            hsmput -v -t -s tar -a {{ HISTORY_DIR_REFINED }} -p {{ PTMP_DIR }}/{{ HISTORY_DIR_REFINED }} \
-                -w $TMPDIR/history_refineDiag $hsmdate
-        """
 {% endif %}
 
     [[DATA-CATALOG]]