Changeset 4669

Timestamp:

07/20/10 08:56:56 (15 years ago)

Author:

Mathieu Morlighem

Message:

Some bug fixing (uninitialized stokesreconditioning and skip non stokes elements

File:

• issm/trunk/src/c/objects/Elements/Penta.cpp (modified) (5 diffs)

issm/trunk/src/c/objects/Elements/Penta.cpp

@@ -1903 +1903 @@
                  this->inputs->AddInput(new BoolInput(CollapseEnum,false));
         }
+
+        //if diagnostic Full-Stokes: check that the element is Stokes
+        if(analysis_type==DiagnosticStokesAnalysisEnum){
+                ISSMASSERT(iomodel->elements_type);
+                if(iomodel->elements_type[2*index+1]==StokesFormulationEnum)
+                 this->inputs->AddInput(new BoolInput(IsStokesEnum,true));
+                else
+                 this->inputs->AddInput(new BoolInput(IsStokesEnum,false));
+        }
+
 }
 /*}}}*/
@@ -3257 +3267 @@
         bool onbed;
         bool shelf;
+        bool isstokes;
 
         /*retrive parameters: */
@@ -3265 +3276 @@
         inputs->GetParameterValue(&onbed,ElementOnBedEnum);
         inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum);
-
-        /*If on water, skip stiffness: */
-        if(onwater)return;
+        inputs->GetParameterValue(&isstokes,IsStokesEnum);
+
+        /*If on water or not Stokes, skip stiffness: */
+        if(onwater || !isstokes) return;
 
         /*recovre material parameters: */
@@ -4205 +4217 @@
         bool onbed;
         bool shelf;
+        bool isstokes;
 
         /*retrieve inputs :*/
@@ -4210 +4223 @@
         inputs->GetParameterValue(&onbed,ElementOnBedEnum);
         inputs->GetParameterValue(&shelf,ElementOnIceShelfEnum);
+        inputs->GetParameterValue(&isstokes,IsStokesEnum);
 
         /*retrieve some parameters: */
         this->parameters->FindParam(&stokesreconditioning,StokesReconditioningEnum);
+
+        /*If on water or not Stokes, skip load: */
+        if(onwater || !isstokes) return;
 
         /*If on water, skip load: */