Changeset 17103

Timestamp:

01/13/14 14:53:59 (11 years ago)

Author:

Mathieu Morlighem

Message:

NEW: making Stress balance analysis work with md.settings.results_on_nodes=1

File:

• issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (modified) (3 diffs)

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

@@ -3303 +3303 @@
 void StressbalanceAnalysis::InputUpdateFromSolutionFS(IssmDouble* solution,Element* element){/*{{{*/
 
+        bool         results_on_nodes;
         int          i,dim,meshtype;
         int*         vdoflist=NULL;
@@ -3310 +3311 @@
         element->FindParam(&meshtype,MeshTypeEnum);
         element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum);
+        element->FindParam(&results_on_nodes,SettingsResultsOnNodesEnum);
         switch(meshtype){
                 case Mesh2DverticalEnum: dim = 2; break;
@@ -3377 +3379 @@
 
         /*Add vx and vy as inputs to the tria element: */
-        //element->AddInput(VxEnum,      vx,      element->VelocityInterpolation());
-        //element->AddInput(VyEnum,      vy,      element->VelocityInterpolation());
-        //element->AddInput(VelEnum,     vel,     element->VelocityInterpolation());
-        //element->AddInput(PressureEnum,pressure,element->PressureInterpolation());
-        //if(dim==3) element->AddInput(VzEnum,vz, element->VelocityInterpolation());
-        element->AddInput(VxEnum,vx,P1Enum);
-        element->AddInput(VyEnum,vy,P1Enum);
-        element->AddInput(VelEnum,vel,P1Enum);
-        element->AddInput(PressureEnum,pressure,P1Enum);
-        if(dim==3) element->AddInput(VzEnum,vz,P1Enum);
+        if(results_on_nodes){
+                element->AddInput(VxEnum,      vx,      element->VelocityInterpolation());
+                element->AddInput(VyEnum,      vy,      element->VelocityInterpolation());
+                element->AddInput(VelEnum,     vel,     element->VelocityInterpolation());
+                element->AddInput(PressureEnum,pressure,element->PressureInterpolation());
+                if(dim==3) element->AddInput(VzEnum,vz, element->VelocityInterpolation());
+        }
+        else{
+                element->AddInput(VxEnum,vx,P1Enum);
+                element->AddInput(VyEnum,vy,P1Enum);
+                element->AddInput(VelEnum,vel,P1Enum);
+                element->AddInput(PressureEnum,pressure,P1Enum);
+                if(dim==3) element->AddInput(VzEnum,vz,P1Enum);
+        }
 
         /*Free ressources:*/