Changeset 25836 for issm/trunk/src/c/analyses/Balancethickness2Analysis.cpp

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/c (modified) (1 prop)
• src/c/analyses/Balancethickness2Analysis.cpp (modified) (7 diffs)

issm/trunk/src/c

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post

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

@@ -23 +23 @@
         return 1;
 }/*}}}*/
-void Balancethickness2Analysis::UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+void Balancethickness2Analysis::UpdateElements(Elements* elements,Inputs* inputs,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
         /*Finite element type*/
@@ -29 +29 @@
 
         /*Load variables in element*/
-        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);
+        iomodel->FetchDataToInput(inputs,elements,"md.geometry.thickness",ThicknessEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.geometry.surface",SurfaceEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.geometry.base",BaseEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.solidearth.initialsealevel",SealevelEnum,0);
+        iomodel->FetchDataToInput(inputs,elements,"md.mask.ice_levelset",MaskIceLevelsetEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.initialization.vx",VxEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.initialization.vy",VyEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.basalforcings.groundedice_melting_rate",BasalforcingsGroundediceMeltingRateEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.smb.mass_balance",SmbMassBalanceEnum);
+        iomodel->FetchDataToInput(inputs,elements,"md.balancethickness.thickening_rate",BalancethicknessThickeningRateEnum);
 
         /*Update elements: */
@@ -45 +45 @@
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(inputs2,i,iomodel,analysis_counter,analysis_type,finiteelement);
+                        element->Update(inputs,i,iomodel,analysis_counter,analysis_type,finiteelement);
 
                         counter++;
@@ -82 +82 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinates(&xyz_list);
-        Input2* vx_input = element->GetInput2(VxEnum); _assert_(vx_input); 
-        Input2* vy_input = element->GetInput2(VyEnum); _assert_(vy_input);
+        Input* vx_input = element->GetInput(VxEnum); _assert_(vx_input); 
+        Input* vy_input = element->GetInput(VyEnum); _assert_(vy_input);
 
         /*Get element characteristic length*/
@@ -90 +90 @@
         /* Start  looping on the number of gaussian points: */
         Gauss* gauss=element->NewGauss(2);
-        for(int ig=gauss->begin();ig<gauss->end();ig++){
-                gauss->GaussPoint(ig);
+        while(gauss->next()){
                 element->NodalFunctionsDerivatives(dbasis,xyz_list,gauss);
                 element->JacobianDeterminant(&Jdet,xyz_list,gauss);
@@ -142 +141 @@
         /*Retrieve all inputs and parameters*/
         element->GetVerticesCoordinates(&xyz_list);
-        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);
+        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);
 
         /* Start  looping on the number of gaussian points: */
         Gauss* gauss=element->NewGauss(2);
-        for(int ig=gauss->begin();ig<gauss->end();ig++){
-                gauss->GaussPoint(ig);
+        while(gauss->next()){
 
                 element->JacobianDeterminant(&Jdet,xyz_list,gauss);
@@ -174 +172 @@
                 element->GetSolutionFromInputsOneDof(solution,ThicknessEnum);
 }/*}}}*/
-void           Balancethickness2Analysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
+void           Balancethickness2Analysis::GradientJ(Vector<IssmDouble>* gradient,Element*  element,int control_type,int control_interp,int control_index){/*{{{*/
         _error_("Not implemented yet");
 }/*}}}*/

@@ -23 +23 @@
 issm_ocean
 issm_dakota
+issm_post