Changeset 25016

Timestamp:

06/11/20 15:21:33 (5 years ago)

Author:

jdquinn

Message:

CHG: Last of cleanup of md.qmu.numberofpartitions in NR

Location:

issm/trunk-jpl/test/NightlyRun

Files:

• test218.js (modified) (2 diffs)
• test234.js (modified) (1 diff)
• test235.js (modified) (1 diff)
• test235.py (modified) (1 diff)
• test250.py (modified) (1 diff)
• test251.py (modified) (1 diff)
• test413.py (modified) (1 diff)
• test445.py (modified) (3 diffs)

issm/trunk-jpl/test/NightlyRun/test218.js

@@ -67 +67 @@
 
 //partitioning
-md.qmu.numberofpartitions=md.mesh.numberofvertices;
-partitioner(md,'package','linear','npart',md.qmu.numberofpartitions);
+npart=md.mesh.numberofvertices;
+partitioner(md,'package','linear','npart',npart);
 md.qmu.partition=md.qmu.partition-1;
 
@@ -107 +107 @@
 //Fields and tolerances to track changes
 md.qmu.results=md.results.dakota;
-md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel')';
+md.results.dakota.importancefactors=importancefactors(md,'scaled_MaterialsRheologyB','MaxVel');
 field_names     =['importancefactors'];
 field_tolerances=[1e-10];

issm/trunk-jpl/test/NightlyRun/test234.js

@@ -26 +26 @@
 
 //partitioning
-md.qmu.numberofpartitions=20;
-partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
+npart=20;
+partitioner(md,'package','chaco','npart',npart,'weighting','on');
 md.qmu.partition=md.qmu.partition-1;
 

issm/trunk-jpl/test/NightlyRun/test235.js

@@ -26 +26 @@
 
 //partitioning
-md.qmu.numberofpartitions=20;
-partitioner(md,'package','chaco','npart',md.qmu.numberofpartitions,'weighting','on');
+npart=20;
+partitioner(md,'package','chaco','npart',npart,'weighting','on');
 md.qmu.partition=md.qmu.partition-1;
 

issm/trunk-jpl/test/NightlyRun/test235.py

@@ -38 +38 @@
 
 #partitioning
-md.qmu.numberofpartitions = 20
-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
-md.qmu.vpartition = md.qmu.vpartition - 1
+npart = 20
+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
 
 #variables
 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_SmbMassBalance',
-    'mean', np.ones(md.qmu.numberofpartitions),
-    'stddev', 100 * np.ones(md.qmu.numberofpartitions),
-    'partition', md.qmu.vpartition
+    'mean', np.ones(npart),
+    'stddev', 100 * np.ones(npart),
+    'partition', partition
     )
 

issm/trunk-jpl/test/NightlyRun/test250.py

@@ -36 +36 @@
 
 #partitioning
-md.qmu.numberofpartitions = md.mesh.numberofvertices
-partition = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
-md.qmu.vpartition = md.qmu.vpartition - 1
+npart = md.mesh.numberofvertices
+partition = partitioner(md, 'package', 'linear', 'npart', npart) - 1
 
 #variables

issm/trunk-jpl/test/NightlyRun/test251.py

@@ -37 +37 @@
 
 #partitioning
-partition = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
+npart = md.mesh.numberofvertices
+partition = partitioner(md, 'package', 'linear', 'npart', npart) - 1
 
 #variables
 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
     'descriptor', 'scaled_SmbMassBalance',
-    'mean', np.ones(md.qmu.numberofpartitions),
-    'stddev', 100 * np.ones(md.qmu.numberofpartitions),
+    'mean', np.ones(md.mesh.numberofvertices),
+    'stddev', 100 * np.ones(md.mesh.numberofvertices),
     'partition', partition
     )

issm/trunk-jpl/test/NightlyRun/test413.py

@@ -23 +23 @@
 
 #partitioning
-md.qmu.numberofpartitions = 20
+npart = 20
 partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
 

issm/trunk-jpl/test/NightlyRun/test445.py

@@ -36 +36 @@
 #partitioning
 npart = 10
-partitioner = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
 md.qmu.isdakota = 1
 
@@ -43 +43 @@
     'descriptor', 'scaled_FrictionEffectivePressure',
     'mean', np.ones(npart),
-    'stddev', .05 * npart),
+    'stddev', .05 * np.ones(npart),
     'partition', partition
     )
@@ -84 +84 @@
     md.qmu.params.evaluation_concurrency = 1
 
-#partitioning
-md.qmu.numberofpartitions = 10
-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
-md.qmu.vpartition = md.qmu.vpartition - 1
-md.qmu.isdakota = 1
-
 md.stressbalance.reltol = 10**-5  #tighten for qmu analyses
-
 
 #solve