Changeset 22274

Timestamp:

11/24/17 12:27:39 (7 years ago)

Author:

kruegern

Message:

CHG: changed some jenkins scripts to ignore test703.py, added 243, 701, and 435 back to jenkins testing. Fixed bamgflowband.py not working well with bamg.py and breaking either 701 or 514 and 119.

Location:

issm/trunk-jpl

Files:

• jenkins/linux64_caladan (modified) (1 diff)
• jenkins/linux64_ross (modified) (1 diff)
• jenkins/linux64_ross_dakota (modified) (1 diff)
• jenkins/linux64_ross_javascript (modified) (1 diff)
• jenkins/linux64_ross_python (modified) (1 diff)
• jenkins/linux64_ross_test (modified) (1 diff)
• src/m/mesh/bamgflowband.py (modified) (1 diff)
• test/NightlyRun/test703.py (added)

issm/trunk-jpl/jenkins/linux64_caladan

@@ -64 +64 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS="--exclude 701 702 435"
+PYTHON_NROPTIONS="--exclude 701 702 435 703"
 MATLAB_NROPTIONS="'exclude',[701,702,435]"

issm/trunk-jpl/jenkins/linux64_ross

@@ -67 +67 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS="--exclude 243 701 702 435"
+PYTHON_NROPTIONS="--exclude 702 703"
 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"

issm/trunk-jpl/jenkins/linux64_ross_dakota

@@ -62 +62 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS=""
+PYTHON_NROPTIONS="--exclude 702 703"
 MATLAB_NROPTIONS="'exclude',[243,701,702,435]"

issm/trunk-jpl/jenkins/linux64_ross_javascript

@@ -49 +49 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-#PYTHON_NROPTIONS="--exclude 119 243 514 701 702 435"
+#PYTHON_NROPTIONS="--exclude 119 243 514 701 702 703 435"
 #MATLAB_NROPTIONS="'exclude',[119,243,514,701,702,435,IdFromString('Dakota')]"

issm/trunk-jpl/jenkins/linux64_ross_python

@@ -58 +58 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS="--exclude 243 701 702 435"
+PYTHON_NROPTIONS="--exclude 702 703"
 MATLAB_NROPTIONS="'exclude',[IdFromString('Dakota')]"

issm/trunk-jpl/jenkins/linux64_ross_test

@@ -64 +64 @@
 #by Matlab and runme.m
 #ex: "'id',[101 102 103]"
-PYTHON_NROPTIONS="--exclude 243 701 702 435"
+PYTHON_NROPTIONS="--exclude 243 701 702 703 435"
 MATLAB_NROPTIONS="'exclude',[243,701,702,435]"

issm/trunk-jpl/src/m/mesh/bamgflowband.py

@@ -25 +25 @@
         #Write expfile with domain outline
         A = OrderedDict()
-        A.x = np.concatenate((x,np.flipud(x),[x[0]]))
-        A.y = np.concatenate((base,np.flipud(surf),[base[0]]))
-        A.nods = np.size(A.x)
+        A['x'] = np.concatenate((x,np.flipud(x),[x[0]]))
+        A['y'] = np.concatenate((base,np.flipud(surf),[base[0]]))
+        A['nods'] = np.size(A['x'])
 
         #markers:
-        m                               = np.ones((np.size(A.x)-1,))    # base        = 1
+        m                               = np.ones((np.size(A['x'])-1,)) # base        = 1
         m[np.size(x) - 1]                       = 2                     # right side  = 2
         m[np.size(x):2 * np.size(x) - 1]        = 3                     # top surface = 3