Changeset 22307

Timestamp:

12/22/17 09:55:19 (7 years ago)

Author:

Mathieu Morlighem

Message:

CHG: fixing SIA now that B is not depth averaged

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceSIAAnalysis.cpp (modified) (4 diffs)
• classes/Materials/Matice.cpp (modified) (2 diffs)

issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp

@@ -331 +331 @@
         IssmDouble  gravity    = element->GetMaterialParameter(ConstantsGEnum);
         IssmDouble  n          = element->GetMaterialParameter(MaterialsRheologyNEnum);
-        IssmDouble  B          = element->GetMaterialParameter(MaterialsRheologyBbarEnum);
+        IssmDouble B;
+        Input* B_input         = element->GetInput(MaterialsRheologyBbarEnum);_assert_(B_input);
         Input* slopex_input    = element->GetInput(SurfaceSlopeXEnum);        _assert_(slopex_input);
         Input* slopey_input    = element->GetInput(SurfaceSlopeYEnum);        _assert_(slopey_input);
@@ -347 +348 @@
                 connectivity=(IssmDouble)element->VertexConnectivity(iv);
 
+                B_input->GetInputValue(&B,gauss);
                 thickness_input->GetInputValue(&thickness,gauss);
                 surface_input->GetInputValue(&surface,gauss);
@@ -418 +420 @@
         IssmDouble  gravity    = element->GetMaterialParameter(ConstantsGEnum);
         IssmDouble  n          = element->GetMaterialParameter(MaterialsRheologyNEnum);
-        IssmDouble  B          = element->GetMaterialParameter(MaterialsRheologyBEnum);
+        IssmDouble B;
+        Input* B_input         = element->GetInput(MaterialsRheologyBEnum);   _assert_(B_input);
         Input* surface_input   = element->GetInput(SurfaceEnum);              _assert_(surface_input);
         Input* slopex_input    = element->GetInput(SurfaceSlopeXEnum);        _assert_(slopex_input);
@@ -448 +451 @@
                         gauss->GaussPoint(ig);
 
+                        B_input->GetInputValue(&B,gauss);
                         slopex_input->GetInputValue(&slope[0],gauss);
                         slopey_input->GetInputValue(&slope[1],gauss);

issm/trunk-jpl/src/c/classes/Materials/Matice.cpp

@@ -217 +217 @@
 IssmDouble Matice::GetB(Gauss* gauss){/*{{{*/
 
+        _assert_(gauss); 
+
         /*Output*/
         IssmDouble B;
@@ -226 +228 @@
 /*}}}*/
 IssmDouble Matice::GetBbar(Gauss* gauss){/*{{{*/
+
+        _assert_(gauss); 
 
         /*Output*/