Changeset 17159 for issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp

Timestamp:

01/22/14 16:14:20 (11 years ago)

Author:

jbondzio

Message:

CHG: extrapolation of scalar field using a steadystate solver

File:

• issm/trunk-jpl/src/c/analyses/ExtrapolationAnalysis.cpp (modified) (6 diffs)

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

@@ -11 +11 @@
 /*}}}*/
 void ExtrapolationAnalysis::UpdateParameters(Parameters* parameters,IoModel* iomodel,int solution_enum,int analysis_enum){/*{{{*/
-        _error_("not implemented yet");
+        //do nothing for now
 }
 /*}}}*/
@@ -29 +29 @@
                 }
         }
-        iomodel->FetchDataToInput(elements,ExtrapolationVariableEnum);//FIXME: is this the correct way?
 }
 /*}}}*/
@@ -38 +37 @@
 /*}}}*/
 void ExtrapolationAnalysis::CreateConstraints(Constraints* constraints,IoModel* iomodel){/*{{{*/
-
-        _error_("not implemented yet");
-
+        // do nothing for now
 }
 /*}}}*/
 void ExtrapolationAnalysis::CreateLoads(Loads* loads, IoModel* iomodel){/*{{{*/
-        
-        _error_("not implemented yet");
-
+//      do nothing for now
 }/*}}}*/
 
@@ -52 +47 @@
 void ExtrapolationAnalysis::Core(FemModel* femmodel){/*{{{*/
 
+        /* Intermediaries */
+        bool save_results;
         /*activate formulation: */
         femmodel->SetCurrentConfiguration(ExtrapolationAnalysisEnum);
@@ -58 +55 @@
         UpdateConstraints(femmodel->elements);
         solutionsequence_linear(femmodel);
+
+        /*recover parameters: */
+        femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
+        if(save_results){
+                if(VerboseSolution()) _printf0_("   Warning: Adding extrapolated variable to results\n");
+                
+                int outputs; 
+                femmodel->parameters->FindParam(&outputs, ExtrapolationVariableEnum);
+                femmodel->RequestedOutputsx(&femmodel->results,&outputs,1);
+        }
 
 }/*}}}*/
@@ -248 +255 @@
         Node* node = NULL;
 
-        /* Get further parameters */
+        /* Get parameters */
         element->FindParam(&extvar_enum, ExtrapolationVariableEnum);
         
         Input* levelset_input=element->GetInput(MaskIceLevelsetEnum); _assert_(levelset_input);
         Input* extvar_input=element->GetInput(extvar_enum); _assert_(extvar_input);
-        
-        GaussPenta* gauss=new GaussPenta();
+
+        Gauss* gauss=element->NewGauss();
         for(int in=0;in<numnodes;in++){
                 gauss->GaussNode(element->GetElementType(),in);
                 node=element->GetNode(in);
                 levelset_input->GetInputValue(&phi,gauss);
-                extvar_input->GetInputValue(&value,gauss);
                 if(phi<=0.){
                         /* if ice, set dirichlet BC */
+                        extvar_input->GetInputValue(&value,gauss);
                         node->ApplyConstraint(1,value);
                 }