Changeset 17010

Timestamp:

12/05/13 08:25:26 (11 years ago)

Author:

Mathieu Morlighem

Message:

BUG: vertical velocities should not be calculated in StressbalanceAnalysis

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)
• analyses/StressbalanceVerticalAnalysis.cpp (modified) (2 diffs)
• cores/stressbalance_core.cpp (modified) (1 diff)

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

@@ -816 +816 @@
 
         /*Intermediaries*/
-        bool isSIA,isSSA,isL1L2,isHO,isFS;
+        bool isSSA,isL1L2,isHO,isFS;
         bool conserve_loads = true;
-        int  meshtype,newton;
+        int  newton;
 
         /* recover parameters:*/
-        femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum);
         femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum);
         femmodel->parameters->FindParam(&isL1L2,FlowequationIsL1L2Enum);
@@ -827 +826 @@
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
         femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum);
-        femmodel->parameters->FindParam(&meshtype,MeshTypeEnum);
 
         if((isSSA || isHO || isL1L2) ^ isFS){ // ^ = xor
@@ -842 +840 @@
                 if(VerboseSolution()) _printf0_("   computing coupling between lower order models and FS\n");
                 solutionsequence_FScoupling_nonlinear(femmodel,conserve_loads);
-        }
-
-        if (meshtype==Mesh3DEnum && (isSIA || isSSA || isL1L2 || isHO)){
-                if(VerboseSolution()) _printf0_("   computing vertical velocities\n");
-                femmodel->SetCurrentConfiguration(StressbalanceVerticalAnalysisEnum);
-                solutionsequence_linear(femmodel);
         }
 

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

@@ -4 +4 @@
 #include "../shared/shared.h"
 #include "../modules/modules.h"
+#include "../solutionsequences/solutionsequences.h"
 
 /*Model processing*/
@@ -97 +98 @@
 /*Finite Element Analysis*/
 void           StressbalanceVerticalAnalysis::Core(FemModel* femmodel){/*{{{*/
-        _error_("not implemented");
+
+                if(VerboseSolution()) _printf0_("   computing vertical velocities\n");
+                femmodel->SetCurrentConfiguration(StressbalanceVerticalAnalysisEnum);
+                solutionsequence_linear(femmodel);
 }/*}}}*/
 ElementVector* StressbalanceVerticalAnalysis::CreateDVector(Element* element){/*{{{*/

issm/trunk-jpl/src/c/cores/stressbalance_core.cpp

@@ -73 +73 @@
         }
 
+        /*Compute vertical velocities*/
+        if (meshtype==Mesh3DEnum && (isSIA || isSSA || isL1L2 || isHO)){
+                analysis = new StressbalanceVerticalAnalysis();
+                analysis->Core(femmodel);
+                delete analysis;
+        }
+
+
         if(save_results){
                 if(VerboseSolution()) _printf0_("   saving results\n");