Changeset 24335 for issm/trunk-jpl/src/c/analyses/Balancethickness2Analysis.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/Balancethickness2Analysis.cpp (modified) (5 diffs)

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

@@ -23 +23 @@
         return 1;
 }/*}}}*/
-void Balancethickness2Analysis::UpdateElements(Elements* elements,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+void Balancethickness2Analysis::UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
         /*Finite element type*/
@@ -29 +29 @@
 
         /*Load variables in element*/
-        iomodel->FetchDataToInput(elements,"md.geometry.thickness",ThicknessEnum);
-        iomodel->FetchDataToInput(elements,"md.geometry.surface",SurfaceEnum);
-        iomodel->FetchDataToInput(elements,"md.geometry.base",BaseEnum);
-        iomodel->FetchDataToInput(elements,"md.slr.sealevel",SealevelEnum,0);
-        iomodel->FetchDataToInput(elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
-        iomodel->FetchDataToInput(elements,"md.initialization.vx",VxEnum);
-        iomodel->FetchDataToInput(elements,"md.initialization.vy",VyEnum);
-        iomodel->FetchDataToInput(elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
-        iomodel->FetchDataToInput(elements,"md.smb.mass_balance",SmbMassBalanceEnum);
-        iomodel->FetchDataToInput(elements,"md.balancethickness.thickening_rate",BalancethicknessThickeningRateEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.thickness",ThicknessEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.surface",SurfaceEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.geometry.base",BaseEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.slr.sealevel",SealevelEnum,0);
+        iomodel->FetchDataToInput(inputs2,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.initialization.vx",VxEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.initialization.vy",VyEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.smb.mass_balance",SmbMassBalanceEnum);
+        iomodel->FetchDataToInput(inputs2,elements,"md.balancethickness.thickening_rate",BalancethicknessThickeningRateEnum);
 
         /*Update elements: */
@@ -45 +45 @@
                 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++;
@@ -82 +82 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinates(&xyz_list);
-        Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); 
-        Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
+        Input2* vx_input = element->GetInput2(VxEnum); _assert_(vx_input); 
+        Input2* vy_input = element->GetInput2(VyEnum); _assert_(vy_input);
 
         /*Get element characteristic length*/
@@ -142 +142 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinates(&xyz_list);
-        Input* ms_input   = element->GetInput(SmbMassBalanceEnum);                _assert_(ms_input);
-        Input* mb_input   = element->GetInput(BasalforcingsGroundediceMeltingRateEnum);       _assert_(mb_input);
-        Input* dhdt_input = element->GetInput(BalancethicknessThickeningRateEnum);            _assert_(dhdt_input);
+        Input2* ms_input   = element->GetInput2(SmbMassBalanceEnum);                _assert_(ms_input);
+        Input2* mb_input   = element->GetInput2(BasalforcingsGroundediceMeltingRateEnum);       _assert_(mb_input);
+        Input2* dhdt_input = element->GetInput2(BalancethicknessThickeningRateEnum);            _assert_(dhdt_input);
 
         /* Start  looping on the number of gaussian points: */