source: issm/oecreview/Archive/24684-25833/ISSM-25009-25010.diff@ 25834

Last change on this file since 25834 was 25834, checked in by Mathieu Morlighem, 4 years ago

CHG: added 24684-25833
File size: 17.9 KB
RevLine 
[25834]1Index: ../trunk-jpl/test/NightlyRun/test444.py
2===================================================================
3--- ../trunk-jpl/test/NightlyRun/test444.py (revision 25009)
4+++ ../trunk-jpl/test/NightlyRun/test444.py (revision 25010)
5@@ -65,17 +65,16 @@
6 version = float(version[0])
7
8 #partitioning
9-md.qmu.numberofpartitions = 10
10-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
11-md.qmu.vpartition = md.qmu.vpartition - 1
12+npart = 10
13+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
14 md.qmu.isdakota = 1
15
16 #variables
17 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
18 'descriptor', 'scaled_BasalforcingsFloatingiceMeltingRate',
19- 'mean', np.ones(md.qmu.numberofpartitions),
20- 'stddev', .1 * np.ones(md.qmu.numberofpartitions),
21- 'partition', md.qmu.vpartition
22+ 'mean', np.ones(npart),
23+ 'stddev', .1 * np.ones(npart),
24+ 'partition', partition
25 )
26
27
28@@ -109,12 +108,6 @@
29 md.qmu.params.analysis_driver = 'stressbalance'
30 md.qmu.params.evaluation_concurrency = 1
31
32-#partitioning
33-md.qmu.numberofpartitions = 10
34-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
35-md.qmu.vpartition = md.qmu.vpartition - 1
36-md.qmu.isdakota = 1
37-
38 md.stressbalance.reltol = 10**-5 #tighten for qmu analyses
39
40 #solve
41Index: ../trunk-jpl/test/NightlyRun/test418.py
42===================================================================
43--- ../trunk-jpl/test/NightlyRun/test418.py (revision 25009)
44+++ ../trunk-jpl/test/NightlyRun/test418.py (revision 25010)
45@@ -21,9 +21,9 @@
46 md.cluster = generic('name', gethostname(), 'np', 3)
47
48 #partitioning
49-md.qmu.numberofpartitions = 100
50+npart = 100
51
52-# Partitioner seamd to generate the following message,
53+# Partitioner seamed to generate the following message,
54 #
55 # corrupted size vs. prev_size
56 # Aborted (core dumped)
57@@ -35,13 +35,12 @@
58 # TODO:
59 # - Run valgrind and fix the above
60 #
61-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions)
62-md.qmu.vpartition = md.qmu.vpartition - 1
63+partition = partitioner(md, 'package', 'chaco', 'npart', npart) - 1
64
65 vector = np.arange(1, 1 + md.mesh.numberofvertices, 1).reshape(-1, 1)
66 # double check this before committing:
67-vector_on_partition = AreaAverageOntoPartition(md, vector)
68-vector_on_nodes = vector_on_partition[md.qmu.vpartition]
69+vector_on_partition = AreaAverageOntoPartition(md, vector, partition)
70+vector_on_nodes = vector_on_partition[partition + 1]
71
72 field_names = ['vector_on_nodes']
73 field_tolerances = [1e-11]
74Index: ../trunk-jpl/test/NightlyRun/test420.m
75===================================================================
76--- ../trunk-jpl/test/NightlyRun/test420.m (revision 25009)
77+++ ../trunk-jpl/test/NightlyRun/test420.m (revision 25010)
78@@ -47,7 +47,7 @@
79 md.qmu.results=md.results.dakota;
80
81 %test on thickness
82-h=zeros(part,1);
83+h=zeros(npart,1);
84 for i=1:npart,
85 h(i)=md.qmu.results.dresp_out(i).mean;
86 end
87Index: ../trunk-jpl/test/NightlyRun/test420.py
88===================================================================
89--- ../trunk-jpl/test/NightlyRun/test420.py (revision 25009)
90+++ ../trunk-jpl/test/NightlyRun/test420.py (revision 25010)
91@@ -16,9 +16,8 @@
92 md.cluster = generic('name', gethostname(), 'np', 3)
93
94 #partitioning
95-md.qmu.numberofpartitions = 10
96-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions)
97-md.qmu.vpartition = md.qmu.vpartition - 1
98+npart = 10
99+partition = partitioner(md, 'package', 'chaco', 'npart', npart) - 1
100 md.qmu.isdakota = 1
101
102 #Dakota options
103@@ -37,7 +36,7 @@
104 #responses
105 md.qmu.responses.MaxVel = response_function.response_function(
106 'descriptor', 'scaled_Thickness',
107- 'partition', md.qmu.vpartition
108+ 'partition', partition
109 )
110
111 #method
112@@ -64,12 +63,12 @@
113 md.qmu.results = md.results.dakota
114
115 #test on thickness
116-h = np.zeros((md.qmu.numberofpartitions, ))
117-for i in range(md.qmu.numberofpartitions):
118+h = np.zeros(npart)
119+for i in range(npart):
120 h[i] = md.qmu.results.dresp_out[i].mean
121
122 #project onto grid
123-thickness = h[(md.qmu.vpartition).flatten()]
124+thickness = h[(md.qmu.vpartition + 1).flatten()]
125
126 #Fields and tolerances to track changes
127 field_names = ['Thickness']
128Index: ../trunk-jpl/test/NightlyRun/test234.py
129===================================================================
130--- ../trunk-jpl/test/NightlyRun/test234.py (revision 25009)
131+++ ../trunk-jpl/test/NightlyRun/test234.py (revision 25010)
132@@ -37,16 +37,15 @@
133 version = float(version[0])
134
135 #partitioning
136-md.qmu.numberofpartitions = 20
137-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
138-md.qmu.vpartition = md.qmu.vpartition - 1
139+npart = 20
140+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
141
142 #variables
143 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
144 'descriptor', 'scaled_SmbMassBalance',
145- 'mean', np.ones(md.qmu.numberofpartitions),
146- 'stddev', .1 * np.ones(md.qmu.numberofpartitions),
147- 'partition', md.qmu.vpartition
148+ 'mean', np.ones(npart),
149+ 'stddev', .1 * np.ones(npart),
150+ 'partition', partition
151 )
152
153 #responses
154Index: ../trunk-jpl/test/NightlyRun/test440.py
155===================================================================
156--- ../trunk-jpl/test/NightlyRun/test440.py (revision 25009)
157+++ ../trunk-jpl/test/NightlyRun/test440.py (revision 25010)
158@@ -17,9 +17,8 @@
159 md.cluster = generic('name', oshostname(), 'np', 3)
160
161 #partitioning
162-md.qmu.numberofpartitions = md.mesh.numberofvertices
163-md = partitioner(md, 'package', 'linear')
164-md.qmu.vpartition = md.qmu.vpartition - 1
165+npart = md.mesh.numberofvertices
166+partition = partitioner(md, 'package', 'linear', 'npart', npart) - 1
167 md.qmu.isdakota = 1
168
169 #Dakota options
170@@ -38,7 +37,7 @@
171 #responses
172 md.qmu.responses.MaxVel = response_function.response_function(
173 'descriptor', 'scaled_Thickness',
174- 'partition', md.qmu.vpartition
175+ 'partition', partition
176 )
177
178 #method
179@@ -65,12 +64,12 @@
180 md.qmu.results = md.results.dakota
181
182 #test on thickness
183-h = np.zeros(md.qmu.numberofpartitions)
184-for i in range(md.qmu.numberofpartitions):
185+h = np.zeros(npart)
186+for i in range(npart):
187 h[i] = md.qmu.results.dresp_out[i].mean
188
189 #project onto grid
190-thickness = h[md.qmu.vpartition]
191+thickness = h[partition]
192
193 #Fields and tolerances to track changes
194 field_names = ['Thickness']
195Index: ../trunk-jpl/test/NightlyRun/test414.py
196===================================================================
197--- ../trunk-jpl/test/NightlyRun/test414.py (revision 25009)
198+++ ../trunk-jpl/test/NightlyRun/test414.py (revision 25010)
199@@ -31,16 +31,15 @@
200 version = float(version[0])
201
202 #partitioning
203-md.qmu.numberofpartitions = 20
204-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
205-md.qmu.vpartition = md.qmu.vpartition - 1
206+npart = 20
207+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
208
209 #variables
210 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
211 'descriptor', 'scaled_FrictionCoefficient',
212- 'mean', np.ones(md.qmu.numberofpartitions),
213- 'stddev', .01 * np.ones(md.qmu.numberofpartitions),
214- 'partition', md.qmu.vpartition
215+ 'mean', np.ones(npart),
216+ 'stddev', .01 * np.ones(npart),
217+ 'partition', partition
218 )
219
220 #responses
221Index: ../trunk-jpl/test/NightlyRun/test218.py
222===================================================================
223--- ../trunk-jpl/test/NightlyRun/test218.py (revision 25009)
224+++ ../trunk-jpl/test/NightlyRun/test218.py (revision 25010)
225@@ -71,9 +71,8 @@
226 md.stressbalance.spcvy[pos] = 0.
227
228 #partitioning
229-md.qmu.numberofpartitions = md.mesh.numberofvertices
230-md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions)
231-md.qmu.vpartition = md.qmu.vpartition - 1
232+npart = md.mesh.numberofvertices
233+partition = partitioner(md, 'package', 'linear', 'npart', npart) - 1
234
235 #Dakota options
236
237@@ -87,7 +86,7 @@
238 'descriptor', 'scaled_MaterialsRheologyB',
239 'mean', np.ones(md.mesh.numberofvertices),
240 'stddev', .05 * np.ones(md.mesh.numberofvertices),
241- 'partition', md.qmu.vpartition
242+ 'partition', partition
243 )
244
245 #responses
246@@ -120,7 +119,7 @@
247
248 #Fields and tolerances to track changes
249 md.qmu.results = md.results.dakota
250-md.results.dakota.importancefactors = importancefactors(md, 'scaled_MaterialsRheologyB', 'MaxVel').reshape(-1, 1)
251+md.results.dakota.importancefactors = importancefactors(md, 'scaled_MaterialsRheologyB', 'MaxVel', partition).reshape(-1, 1)
252 field_names = ['importancefactors']
253 field_tolerances = [1e-10]
254 field_values = [md.results.dakota.importancefactors]
255Index: ../trunk-jpl/test/NightlyRun/test417.py
256===================================================================
257--- ../trunk-jpl/test/NightlyRun/test417.py (revision 25009)
258+++ ../trunk-jpl/test/NightlyRun/test417.py (revision 25010)
259@@ -31,16 +31,16 @@
260 version = float(version[0])
261
262 #partitioning
263-md.qmu.numberofpartitions = 20
264-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
265-md.qmu.vpartition = md.qmu.vpartition - 1
266+npart = 20
267+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
268+md.qmu.isdakota = 1
269
270 #variables
271 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
272 'descriptor', 'scaled_FrictionCoefficient',
273- 'mean', np.ones(md.qmu.numberofpartitions),
274- 'stddev', .01 * np.ones(md.qmu.numberofpartitions),
275- 'partition', md.qmu.vpartition
276+ 'mean', np.ones(npart),
277+ 'stddev', .01 * np.ones(npart),
278+ 'partition', partition
279 )
280
281 #responses
282@@ -58,11 +58,11 @@
283 md.qmu.mass_flux_profiles = ['../Exp/MassFlux1.exp', '../Exp/MassFlux2.exp', '../Exp/MassFlux3.exp', '../Exp/MassFlux4.exp', '../Exp/MassFlux5.exp', '../Exp/MassFlux6.exp', '../Exp/Square.exp']
284 md.qmu.mass_flux_profile_directory = getcwd()
285
286-#method
287+# nond_sampling study
288 md.qmu.method = dakota_method.dakota_method('nond_samp')
289 md.qmu.method = dmeth_params_set(md.qmu.method, 'seed', 1234, 'samples', 20, 'sample_type', 'lhs')
290
291-#parameters
292+# parameters
293 md.qmu.params.interval_type = 'forward'
294 md.qmu.params.direct = True
295 md.qmu.params.tabular_graphics_data = True
296@@ -75,12 +75,6 @@
297 md.qmu.params.analysis_driver = 'stressbalance'
298 md.qmu.params.evaluation_concurrency = 1
299
300-#partitioning
301-md.qmu.numberofpartitions = 20
302-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
303-md.qmu.vpartition = md.qmu.vpartition - 1
304-md.qmu.isdakota = 1
305-
306 md.stressbalance.reltol = 10**-5 #tighten for qmu analyses
307
308 #solve
309Index: ../trunk-jpl/test/NightlyRun/test445.py
310===================================================================
311--- ../trunk-jpl/test/NightlyRun/test445.py (revision 25009)
312+++ ../trunk-jpl/test/NightlyRun/test445.py (revision 25010)
313@@ -34,23 +34,22 @@
314 version = float(version[0])
315
316 #partitioning
317-md.qmu.numberofpartitions = 10
318-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
319-md.qmu.vpartition = md.qmu.vpartition - 1
320+npart = 10
321+partitioner = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
322 md.qmu.isdakota = 1
323
324 #variables
325 md.qmu.variables.neff = normal_uncertain.normal_uncertain(
326 'descriptor', 'scaled_FrictionEffectivePressure',
327- 'mean', np.ones(md.qmu.numberofpartitions),
328- 'stddev', .05 * np.ones(md.qmu.numberofpartitions),
329- 'partition', md.qmu.vpartition
330+ 'mean', np.ones(npart),
331+ 'stddev', .05 * npart),
332+ 'partition', partition
333 )
334 md.qmu.variables.geoflux = normal_uncertain.normal_uncertain(
335 'descriptor', 'scaled_BasalforcingsGeothermalflux',
336- 'mean', np.ones(md.qmu.numberofpartitions),
337- 'stddev', .05 * np.ones(md.qmu.numberofpartitions),
338- 'partition', md.qmu.vpartition
339+ 'mean', np.ones(npart),
340+ 'stddev', .05 * np.ones(npart),
341+ 'partition', partition
342 )
343
344 #responses
345Index: ../trunk-jpl/test/NightlyRun/test412.py
346===================================================================
347--- ../trunk-jpl/test/NightlyRun/test412.py (revision 25009)
348+++ ../trunk-jpl/test/NightlyRun/test412.py (revision 25010)
349@@ -18,9 +18,7 @@
350 md.cluster = generic('name', gethostname(), 'np', 3)
351
352 #partitioning
353-md.qmu.numberofpartitions = md.mesh.numberofvertices
354-md = partitioner(md, 'package', 'linear', 'npart', md.qmu.numberofpartitions)
355-md.qmu.vpartition = md.qmu.vpartition - 1
356+md = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
357 md.qmu.isdakota = 1
358
359 #Dakota options
360@@ -39,7 +37,7 @@
361 'descriptor', 'scaled_FrictionCoefficient',
362 'mean', np.ones(md.mesh.numberofvertices),
363 'stddev', .01 * np.ones(md.mesh.numberofvertices),
364- 'partition', md.qmu.vpartition
365+ 'partition', partition
366 )
367
368 #responses
369@@ -69,7 +67,7 @@
370
371 #Fields and tolerances to track changes
372 md.qmu.results = md.results.dakota
373-md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel').T
374+md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel', partition).T
375 field_names = ['importancefactors']
376 field_tolerances = [1e-10]
377 field_values = [md.results.dakota.importancefactors]
378Index: ../trunk-jpl/test/NightlyRun/test250.py
379===================================================================
380--- ../trunk-jpl/test/NightlyRun/test250.py (revision 25009)
381+++ ../trunk-jpl/test/NightlyRun/test250.py (revision 25010)
382@@ -36,15 +36,15 @@
383
384 #partitioning
385 md.qmu.numberofpartitions = md.mesh.numberofvertices
386-md = partitioner(md, 'package', 'linear')
387+partition = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
388 md.qmu.vpartition = md.qmu.vpartition - 1
389
390 #variables
391 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
392 'descriptor', 'scaled_SmbMassBalance',
393- 'mean', np.ones(md.qmu.numberofpartitions),
394- 'stddev', .1 * np.ones(md.qmu.numberofpartitions),
395- 'partition', md.qmu.vpartition
396+ 'mean', np.ones(md.mesh.numberofvertices),
397+ 'stddev', .1 * np.ones(md.mesh.numberofvertices),
398+ 'partition', partition
399 )
400
401 #responses
402Index: ../trunk-jpl/test/NightlyRun/test413.py
403===================================================================
404--- ../trunk-jpl/test/NightlyRun/test413.py (revision 25009)
405+++ ../trunk-jpl/test/NightlyRun/test413.py (revision 25010)
406@@ -23,8 +23,7 @@
407
408 #partitioning
409 md.qmu.numberofpartitions = 20
410-md = partitioner(md, 'package', 'chaco', 'npart', md.qmu.numberofpartitions, 'weighting', 'on')
411-md.qmu.vpartition = md.qmu.vpartition - 1
412+partition = partitioner(md, 'package', 'chaco', 'npart', npart, 'weighting', 'on') - 1
413
414 #variables
415 md.qmu.variables.rho_ice = normal_uncertain.normal_uncertain(
416@@ -34,9 +33,9 @@
417 )
418 md.qmu.variables.drag_coefficient = normal_uncertain.normal_uncertain(
419 'descriptor', 'scaled_FrictionCoefficient',
420- 'mean', np.ones(md.qmu.numberofpartitions),
421- 'stddev', .01 * np.ones(md.qmu.numberofpartitions),
422- 'partition', md.qmu.vpartition
423+ 'mean', np.ones(npart),
424+ 'stddev', .01 * np.ones(npart),
425+ 'partition', partition
426 )
427
428 #responses
429@@ -68,7 +67,7 @@
430
431 #Fields and tolerances to track changes
432 md.qmu.results = md.results.dakota
433-md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel').T
434+md.results.dakota.importancefactors = importancefactors(md, 'scaled_FrictionCoefficient', 'MaxVel', partition).T
435 field_names = ['importancefactors']
436 field_tolerances = [1e-10]
437 field_values = [md.results.dakota.importancefactors]
438Index: ../trunk-jpl/test/NightlyRun/test251.py
439===================================================================
440--- ../trunk-jpl/test/NightlyRun/test251.py (revision 25009)
441+++ ../trunk-jpl/test/NightlyRun/test251.py (revision 25010)
442@@ -36,9 +36,7 @@
443 version = float(version[0])
444
445 #partitioning
446-md.qmu.numberofpartitions = md.mesh.numberofvertices
447-md = partitioner(md, 'package', 'linear')
448-md.qmu.vpartition = md.qmu.vpartition - 1
449+partition = partitioner(md, 'package', 'linear', 'npart', md.mesh.numberofvertices) - 1
450
451 #variables
452 md.qmu.variables.surface_mass_balance = normal_uncertain.normal_uncertain(
453@@ -45,7 +43,7 @@
454 'descriptor', 'scaled_SmbMassBalance',
455 'mean', np.ones(md.qmu.numberofpartitions),
456 'stddev', 100 * np.ones(md.qmu.numberofpartitions),
457- 'partition', md.qmu.vpartition
458+ 'partition', partition
459 )
460
461 #responses
462Index: ../trunk-jpl/src/m/classes/qmu.py
463===================================================================
464--- ../trunk-jpl/src/m/classes/qmu.py (revision 25009)
465+++ ../trunk-jpl/src/m/classes/qmu.py (revision 25010)
466@@ -26,8 +26,6 @@
467 self.method = OrderedDict()
468 self.params = OrderedStruct()
469 self.results = OrderedDict()
470- self.vpartition = float('NaN')
471- self.epartition = float('NaN')
472 self.numberofpartitions = 0
473 self.numberofresponses = 0
474 self.variabledescriptors = []
475@@ -77,7 +75,7 @@
476 if isinstance(method, dakota_method):
477 s += " method : '%s'\n" % (method.method)
478
479- # params could be have a number of forms (mainly 1 struct or many)
480+ # params could have a number of forms (mainly 1 struct or many)
481 if type(self.params) == OrderedStruct:
482 params = [self.params]
483 else:
484@@ -183,8 +181,6 @@
485 if not self.isdakota:
486 WriteData(fid, prefix, 'data', False, 'name', 'md.qmu.mass_flux_segments_present', 'format', 'Boolean')
487 return
488- WriteData(fid, prefix, 'object', self, 'fieldname', 'vpartition', 'format', 'DoubleMat', 'mattype', 2)
489- WriteData(fid, prefix, 'object', self, 'fieldname', 'epartition', 'format', 'DoubleMat', 'mattype', 2)
490 WriteData(fid, prefix, 'object', self, 'fieldname', 'numberofpartitions', 'format', 'Integer')
491 WriteData(fid, prefix, 'object', self, 'fieldname', 'numberofresponses', 'format', 'Integer')
492 WriteData(fid, prefix, 'object', self, 'fieldname', 'variabledescriptors', 'format', 'StringArray')
Note: See TracBrowser for help on using the repository browser.