Changeset 24058

Timestamp:

07/02/19 07:31:17 (6 years ago)

Author:

seroussi

Message:

FIX: no need to remove vertex pairing if no coupling requested

Location:

issm/trunk-jpl/src/m/parameterization

Files:

• setflowequation.m (modified) (1 diff)
• setflowequation.py (modified) (1 diff)

issm/trunk-jpl/src/m/parameterization/setflowequation.m

@@ -116 +116 @@
 
 %Now take care of the coupling between SSA and HO
-md.stressbalance.vertex_pairing=[];
+if strcmpi(coupling_method,'penalties'),
+        md.stressbalance.vertex_pairing=[];
+end
 nodeonSSAHO=zeros(md.mesh.numberofvertices,1);
 nodeonHOFS=zeros(md.mesh.numberofvertices,1);

issm/trunk-jpl/src/m/parameterization/setflowequation.py

@@ -107 +107 @@
 
         #Now take care of the coupling between SSA and HO
-        md.stressbalance.vertex_pairing=np.array([])
+        if not coupling_method in ['penalties']:
+            md.stressbalance.vertex_pairing=np.array([])
         nodeonSSAHO=np.zeros(md.mesh.numberofvertices,bool)
         nodeonHOFS=np.zeros(md.mesh.numberofvertices,bool)