Changeset 17009

Timestamp:

12/05/13 08:05:35 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: moving some cores to analyses

Location:

issm/trunk-jpl/src/c

Files:

• analyses/Analysis.h (modified) (1 diff)
• analyses/StressbalanceAnalysis.cpp (modified) (2 diffs)
• analyses/StressbalanceSIAAnalysis.cpp (modified) (2 diffs)
• cores/stressbalance_core.cpp (modified) (5 diffs)

issm/trunk-jpl/src/c/analyses/Analysis.h

@@ -33 +33 @@
 
                 /*Finite element Analysis*/
+                virtual void           Core(FemModel* femmodel)=0;
                 virtual ElementVector* CreateDVector(Element* element)=0;
                 virtual ElementMatrix* CreateJacobianMatrix(Element* element)=0;

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

@@ -4 +4 @@
 #include "../shared/shared.h"
 #include "../modules/modules.h"
+#include "../solutionsequences/solutionsequences.h"
 
 /*Model processing*/
@@ -813 +814 @@
 /*Finite Element Analysis*/
 void           StressbalanceAnalysis::Core(FemModel* femmodel){/*{{{*/
-        _error_("not implemented");
+
+        /*Intermediaries*/
+        bool isSIA,isSSA,isL1L2,isHO,isFS;
+        bool conserve_loads = true;
+        int  meshtype,newton;
+
+        /* recover parameters:*/
+        femmodel->parameters->FindParam(&isSIA,FlowequationIsSIAEnum);
+        femmodel->parameters->FindParam(&isSSA,FlowequationIsSSAEnum);
+        femmodel->parameters->FindParam(&isL1L2,FlowequationIsL1L2Enum);
+        femmodel->parameters->FindParam(&isHO,FlowequationIsHOEnum);
+        femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
+        femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum);
+        femmodel->parameters->FindParam(&meshtype,MeshTypeEnum);
+
+        if((isSSA || isHO || isL1L2) ^ isFS){ // ^ = xor
+                if(VerboseSolution()) _printf0_("   computing velocities\n");
+
+                femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
+                if(newton>0)
+                 solutionsequence_newton(femmodel);
+                else
+                 solutionsequence_nonlinear(femmodel,conserve_loads); 
+        }
+
+        if ((isSSA || isL1L2 || isHO) && isFS){
+                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);
+        }
+
 }/*}}}*/
 ElementVector* StressbalanceAnalysis::CreateDVector(Element* element){/*{{{*/

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

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

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

@@ -6 +6 @@
 #include "../toolkits/toolkits.h"
 #include "../classes/classes.h"
+#include "../analyses/analyses.h"
 #include "../shared/shared.h"
 #include "../modules/modules.h"
@@ -13 +14 @@
 
         /*parameters: */
-        bool  dakota_analysis;
-        int   meshtype;
-        bool  isSIA,isSSA,isL1L2,isHO,isFS;
-        bool  conserve_loads    = true;
-        bool  save_results;
-        int   newton;
-        int   solution_type;
-        int   numoutputs        = 0;
-        char** requested_outputs = NULL;
-        int    i;
-
+        bool       dakota_analysis;
+        int        meshtype;
+        bool       isSIA,isSSA,isL1L2,isHO,isFS;
+        bool       save_results;
+        int        solution_type;
+        int        numoutputs        = 0;
+        char     **requested_outputs = NULL;
+        Analysis  *analysis          = NULL;
 
         /* recover parameters:*/
@@ -32 +30 @@
         femmodel->parameters->FindParam(&isHO,FlowequationIsHOEnum);
         femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum);
-        femmodel->parameters->FindParam(&newton,StressbalanceIsnewtonEnum);
         femmodel->parameters->FindParam(&dakota_analysis,QmuIsdakotaEnum);
         femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
@@ -47 +44 @@
         }
 
-        /*Compute slopes: */
+        /*Compute slopes if necessary */
         if(isSIA || (isFS && meshtype==Mesh2DverticalEnum)) surfaceslope_core(femmodel);
         if(isFS){
@@ -55 +52 @@
         }
 
+        /*Compute SIA velocities*/
         if(isSIA){
-                if(VerboseSolution()) _printf0_("   computing SIA velocities\n");
 
                 /*Take the last velocity into account so that the velocity on the SSA domain is not zero*/
                 if(isSSA || isL1L2 || isHO ) ResetBoundaryConditions(femmodel,StressbalanceSIAAnalysisEnum);
-                femmodel->SetCurrentConfiguration(StressbalanceSIAAnalysisEnum);
-                solutionsequence_linear(femmodel);
+
+                analysis = new StressbalanceSIAAnalysis();
+                analysis->Core(femmodel);
+                delete analysis;
+
+                /*Reset velocities for other ice flow models*/
                 if(isSSA || isL1L2 || isHO) ResetBoundaryConditions(femmodel,StressbalanceAnalysisEnum);
         }
 
-        if ((isSSA || isHO || isL1L2) ^ isFS){ // ^ = xor
-                if(VerboseSolution()) _printf0_("   computing velocities\n");
-
-                femmodel->SetCurrentConfiguration(StressbalanceAnalysisEnum);
-                if(newton>0)
-                 solutionsequence_newton(femmodel);
-                else
-                 solutionsequence_nonlinear(femmodel,conserve_loads); 
-        }
-
-        if ((isSSA || isL1L2 || isHO) && isFS){
-                if(VerboseSolution()) _printf0_("   computing coupling betweem lower order models and full-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);
+        /*Compute stressbalance for SSA L1L2 HO and FS*/
+        if(isSSA || isL1L2 || isHO || isFS){
+                analysis = new StressbalanceAnalysis();
+                analysis->Core(femmodel);
+                delete analysis;
         }