Changeset 17107

Timestamp:

01/13/14 19:47:20 (11 years ago)

Author:

Mathieu Morlighem

Message:

REV: reverting back to previous version

Location:

issm/trunk-jpl/src/c

Files:

• analyses/StressbalanceAnalysis.cpp (modified) (7 diffs)
• shared/Exceptions/Exceptions.cpp (modified) (1 diff)

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

@@ -2596 +2596 @@
 
         /* Start  looping on the number of gaussian points: */
-        Gauss* gauss = element->NewGauss(10);
+        Gauss* gauss = element->NewGauss(5);
         for(int ig=gauss->begin();ig<gauss->end();ig++){
                 gauss->GaussPoint(ig);
@@ -2680 +2680 @@
                 element->GetGroundedPart(&point1,&fraction1,&fraction2,&mainlyfloating);
                 //gauss = element->NewGauss(point1,fraction1,fraction2,mainlyfloating,2);
-                gauss=element->NewGaussBase(10);
+                gauss=element->NewGaussBase(3);
         }
         else{
-                gauss=element->NewGaussBase(10);
+                gauss=element->NewGaussBase(3);
         }
 
@@ -2771 +2771 @@
 
         /* Start  looping on the number of gaussian points: */
-        Gauss* gauss=element->NewGauss(10);
+        Gauss* gauss=element->NewGauss(5);
         for(int ig=gauss->begin();ig<gauss->end();ig++){
                 gauss->GaussPoint(ig);
@@ -2844 +2844 @@
 
         /* Start  looping on the number of gaussian points: */
-        Gauss* gauss=element->NewGaussBase(10);
+        Gauss* gauss=element->NewGaussBase(5);
         for(int ig=gauss->begin();ig<gauss->end();ig++){
                 gauss->GaussPoint(ig);
@@ -3303 +3303 @@
 void StressbalanceAnalysis::InputUpdateFromSolutionFS(IssmDouble* solution,Element* element){/*{{{*/
 
-        bool         results_on_nodes;
         int          i,dim,meshtype;
         int*         vdoflist=NULL;
@@ -3311 +3310 @@
         element->FindParam(&meshtype,MeshTypeEnum);
         element->FindParam(&FSreconditioning,StressbalanceFSreconditioningEnum);
-        element->FindParam(&results_on_nodes,SettingsResultsOnNodesEnum);
         switch(meshtype){
                 case Mesh2DverticalEnum: dim = 2; break;
@@ -3379 +3377 @@
 
         /*Add vx and vy as inputs to the tria element: */
-        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);
-        }
+        //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);
 
         /*Free ressources:*/

issm/trunk-jpl/src/c/shared/Exceptions/Exceptions.cpp

@@ -45 +45 @@
 
         file_line= what_line;
-        this->Report();
 
 }/*}}}*/