source: issm/oecreview/Archive/23390-24306/ISSM-24286-24287.diff@ 24307

Last change on this file since 24307 was 24307, checked in by Mathieu Morlighem, 5 years ago

NEW: adding Archive/23390-24306
File size: 1.6 KB
RevLine 
[24307]1Index: ../trunk-jpl/src/m/classes/masstransport.py
2===================================================================
3--- ../trunk-jpl/src/m/classes/masstransport.py (revision 24286)
4+++ ../trunk-jpl/src/m/classes/masstransport.py (revision 24287)
5@@ -73,6 +73,7 @@
6 md = checkfield(md, 'fieldname', 'masstransport.stabilization', 'values', [0, 1, 2, 3, 4])
7 md = checkfield(md, 'fieldname', 'masstransport.min_thickness', '>', 0)
8 md = checkfield(md, 'fieldname', 'masstransport.requested_outputs', 'stringrow', 1)
9+ md = checkfield(md, 'fieldname', 'masstransport.vertex_pairing', '>', 0)
10
11 return md
12 # }}}
13Index: ../trunk-jpl/src/m/classes/stressbalance.py
14===================================================================
15--- ../trunk-jpl/src/m/classes/stressbalance.py (revision 24286)
16+++ ../trunk-jpl/src/m/classes/stressbalance.py (revision 24287)
17@@ -133,7 +133,7 @@
18 md = checkfield(md, 'fieldname', 'stressbalance.referential', 'size', [md.mesh.numberofvertices, 6])
19 md = checkfield(md, 'fieldname', 'stressbalance.loadingforce', 'size', [md.mesh.numberofvertices, 3])
20 md = checkfield(md, 'fieldname', 'stressbalance.requested_outputs', 'stringrow', 1)
21-
22+ md = checkfield(md, 'fieldname', 'stressbalance.vertex_pairing', '>', 0)
23 #singular solution
24 # if ~any((~isnan(md.stressbalance.spcvx) + ~isnan(md.stressbalance.spcvy)) == 2),
25 if not np.any(np.logical_and(np.logical_not(np.isnan(md.stressbalance.spcvx)), np.logical_not(np.isnan(md.stressbalance.spcvy)))):
Note: See TracBrowser for help on using the repository browser.