Changeset 17541

Timestamp:

03/25/14 13:58:24 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: preparing input update from solution XTH

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (1 diff)
• analyses/StressbalanceAnalysis.h (modified) (1 diff)
• solutionsequences/solutionsequence_la_theta.cpp (modified) (1 diff)

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

@@ -4248 +4248 @@
         xDelete<int>(cs_list);
 }/*}}}*/
+void StressbalanceAnalysis::InputUpdateFromSolutionFSXTH(Elements* elements,Parameters* parameters){/*{{{*/
+
+        /*Intermediaries*/
+        int  dim,meshtype;
+
+        parameters->FindParam(&meshtype,MeshTypeEnum);
+        switch(meshtype){
+                case Mesh2DverticalEnum: dim = 2; break;
+                case Mesh3DEnum:         dim = 3; break;
+                case Mesh3DtetrasEnum:   dim = 3; break;
+                default: _error_("mesh "<<EnumToStringx(meshtype)<<" not supported yet");
+        }
+
+        for(int i=0;i<elements->Size();i++){
+                Element* element=dynamic_cast<Element*>(elements->GetObjectByOffset(i));
+
+                /*Get inputs and parameters*/
+                Input* vx_input=element->GetInput(VxEnum); _assert_(vx_input);
+                Input* vy_input=element->GetInput(VyEnum); _assert_(vy_input);
+                Input* vz_input;
+                if(dim==3){vz_input=element->GetInput(VzEnum); _assert_(vz_input);}
+
+                _error_("NOT implemented yet");
+        }
+
+}/*}}}*/
 
 /*Coupling (Tiling)*/

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

@@ -81 +81 @@
                 void GetSolutionFromInputsFS(Vector<IssmDouble>* solution,Element* element);
                 void InputUpdateFromSolutionFS(IssmDouble* solution,Element* element);
+                void InputUpdateFromSolutionFSXTH(Elements* elements,Parameters* parameters);
                 void InitializeXTH(Elements* elements,Parameters* parameters);
                 /*Coupling*/

issm/trunk-jpl/src/c/solutionsequences/solutionsequence_la_theta.cpp

@@ -42 +42 @@
 
         /*Update d and tau accordingly*/
+        analysis->InputUpdateFromSolutionFSXTH(femmodel->elements,femmodel->parameters);
+
+        /*Check for convergence*/
         _error_("STOP");