Changeset 25924

Timestamp:

01/05/21 11:26:26 (4 years ago)

Author:

jdquinn

Message:

CHG: Minor clean up

Location:

issm/trunk-jpl/jenkins

Files:

• examples_tests.sh (modified) (3 diffs)
• jenkins.sh (modified) (1 diff)

issm/trunk-jpl/jenkins/examples_tests.sh

@@ -1 +1 @@
 #!/bin/bash
 ################################################################################
-# This script runs the examples tests. It is intended to be called from 
-# jenkins/jenkins.sh and helps organization.
+# This script runs the examples tests (i.e. contents of examples directory, 
+# which are implementations of the tutorials found at 
+# https://issm.jpl.nasa.gov/documentation/tutorials/). It is intended to be 
+# called from jenkins/jenkins.sh.
+#
+# runme files are modifed as needed to fill in statements that would otherwise 
+# be added by user.
+#
+# NOTE:
+# - Indentation of replacement string literals (e.g. 'STEP_EIGHT') is set to 
+#       nest cleanly in this file, but will result in unclean nesting runme file 
+#       (which should not be an issue)
+# - Single-line string replacements in runme.m can effectively be performed 
+#       using sed. When performing multi-line replacements, perl is a better 
+#       option.
 #
 # TODO:
@@ -27 +40 @@
 for dir in ./* ; do
         if [ -d "${dir}" ]; then
+                # Temporary short circuit to check single example
+                if [ "${dir}" != "./UncertaintyQuantification" ]; then
+                        continue
+                fi
+
                 # Some of the examples are incomplete (on purpose). As such, we 
                 # will have to populate the missing steps in order to make sure 
@@ -581 +599 @@
                         RUN_EXAMPLE=1
                 elif [ "${dir}" == "./UncertaintyQuantification" ]; then
-                        #Step 3: sampling analysis
-                        #Index exceeds the number of array elements (1).
-                        #
-                        #Error in AreaAverageOntoPartition (line 50)
-                        #       partvector(i)=sum(weightedvector(pos))/sum(md.qmu.vertex_weight(pos));
-                        #
-                        #Error in runme (line 78)
-                        #       DeltaHH_on_partition=AreaAverageOntoPartition(md,DeltaHH,partition);
                         sed -i '.bak' 's|steps=\[1\];|steps=\[1:7\];\n\ntry\n|' $RUNME_FILE
-                        RUN_EXAMPLE=0
+                        RUN_EXAMPLE=1
                 else
                         echo "Not implemented yet!"

issm/trunk-jpl/jenkins/jenkins.sh

@@ -423 +423 @@
 # Examples Tests
 # {{{
-# The following tests check that the examples (i.e. contents of examples 
-# directory, which are implementations of the tutorials found at 
-# https://issm.jpl.nasa.gov/documentation/tutorials/) can be run.
-#
-# runme files are modifed as needed to fill in statements that would otherwise 
-# be added by user.
-#
-# NOTE: 
-# - Indentation of replacement string literals (e.g. 'STEP_EIGHT') is set to 
-#       nest cleanly in this file, but will result in unclean nesting runme file 
-#       (which should not be an issue)
-# - Single-line string replacements in runme.m can effectively be performed 
-#       using sed. When performing multi-line replacements, perl is a better 
-#       option.
-#
 if [ $EXAMPLES_TEST -eq 1 ]; then
         $ISSM_DIR/jenkins/examples_tests.sh