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

Timestamp:

11/15/19 16:28:40 (5 years ago)

Author:

Mathieu Morlighem

Message:

NEW: added Inputs2, TODO: still AMR, GEMB and DC do not work, and need to delete current Inputs

File:

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

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

@@ -26 +26 @@
 }
 /*}}}*/
-void ExtrapolationAnalysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+void ExtrapolationAnalysis::UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
         int    finiteelement;
 
@@ -37 +37 @@
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(i,iomodel,analysis_counter,analysis_type,finiteelement);
+                        element->Update(inputs2,i,iomodel,analysis_counter,analysis_type,finiteelement);
                         counter++;
                 }
         }
         if(iomodel->domaintype!=Domain2DhorizontalEnum){
-                iomodel->FetchDataToInput(elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
-                iomodel->FetchDataToInput(elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);
+                iomodel->FetchDataToInput(inputs2,elements,"md.mesh.vertexonbase",MeshVertexonbaseEnum);
+                iomodel->FetchDataToInput(inputs2,elements,"md.mesh.vertexonsurface",MeshVertexonsurfaceEnum);
         }
 }
@@ -124 +124 @@
 
         /*Retrieve all inputs and parameters*/
-        Input* lsf_slopex_input=workelement->GetInput(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
-        Input* lsf_slopey_input=workelement->GetInput(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
+        Input2* lsf_slopex_input=workelement->GetInput2(LevelsetfunctionSlopeXEnum); _assert_(lsf_slopex_input);
+        Input2* lsf_slopey_input=workelement->GetInput2(LevelsetfunctionSlopeYEnum); _assert_(lsf_slopey_input);
         workelement->GetVerticesCoordinates(&xyz_list);
 
@@ -338 +338 @@
         element->FindParam(&extvar_enum, ExtrapolationVariableEnum);
 
-        Input* active_input=element->GetInput(IceMaskNodeActivationEnum); _assert_(active_input);
-        Input* extvar_input=element->GetInput(extvar_enum); _assert_(extvar_input);
+        Input2* active_input=element->GetInput2(IceMaskNodeActivationEnum); _assert_(active_input);
+        Input2* extvar_input=element->GetInput2(extvar_enum); _assert_(extvar_input);
 
         Gauss* gauss=element->NewGauss();