Changeset 25836 for issm/trunk/src/c/analyses/SmoothAnalysis.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/SmoothAnalysis.cpp (modified) (6 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/SmoothAnalysis.cpp

@@ -18 +18 @@
         return 1;
 }/*}}}*/
-void SmoothAnalysis::UpdateElements(Elements* elements,Inputs2* inputs2,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
+void SmoothAnalysis::UpdateElements(Elements* elements,Inputs* inputs,IoModel* iomodel,int analysis_counter,int analysis_type){/*{{{*/
 
         /*Update elements: */
@@ -25 +25 @@
                 if(iomodel->my_elements[i]){
                         Element* element=(Element*)elements->GetObjectByOffset(counter);
-                        element->Update(inputs2,i,iomodel,analysis_counter,analysis_type,P1Enum);
+                        element->Update(inputs,i,iomodel,analysis_counter,analysis_type,P1Enum);
                         counter++;
                 }
@@ -70 +70 @@
         element->FindParam(&l,SmoothThicknessMultiplierEnum); _assert_(l>0.);
         element->GetVerticesCoordinates(&xyz_list);
-        Input2* thickness_input = element->GetInput2(ThicknessEnum); _assert_(thickness_input);
+        Input* thickness_input = element->GetInput(ThicknessEnum); _assert_(thickness_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);
@@ -116 +115 @@
         IssmDouble  Jdet,value;
         IssmDouble *xyz_list  = NULL;
-        Input2     *input = NULL;
+        Input     *input = NULL;
 
         /*SPECIFICS: Driving stress for balance velocities*/
-        Input2*      H_input = NULL, *surface_input = NULL, *vx_input = NULL, *vy_input = NULL;
+        Input*      H_input = NULL, *surface_input = NULL, *vx_input = NULL, *vy_input = NULL;
         IssmDouble  taud_x,norms,normv,vx,vy;
         IssmDouble  rho_ice,gravity,slope[2],thickness;
@@ -139 +138 @@
                         rho_ice       = element->FindParam(MaterialsRhoIceEnum);
                         gravity       = element->FindParam(ConstantsGEnum);
-                        H_input       = element->GetInput2(ThicknessEnum); _assert_(H_input);
-                        surface_input = element->GetInput2(SurfaceEnum);   _assert_(surface_input);
-                        vx_input      = element->GetInput2(VxEnum);
-                        vy_input      = element->GetInput2(VyEnum);
+                        H_input       = element->GetInput(ThicknessEnum); _assert_(H_input);
+                        surface_input = element->GetInput(SurfaceEnum);   _assert_(surface_input);
+                        vx_input      = element->GetInput(VxEnum);
+                        vy_input      = element->GetInput(VyEnum);
                         }
                         break;
                 case SurfaceSlopeXEnum:
                 case SurfaceSlopeYEnum:{
-                        surface_input = element->GetInput2(SurfaceEnum);   _assert_(surface_input);
-                        }
-                        break;
-                default: input = element->GetInput2(input_enum);
+                        surface_input = element->GetInput(SurfaceEnum);   _assert_(surface_input);
+                        }
+                        break;
+                default: input = element->GetInput(input_enum);
         }
 
         /* 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);
@@ -206 +204 @@
            _error_("not implemented yet");
 }/*}}}*/
-void           SmoothAnalysis::GradientJ(Vector<IssmDouble>* gradient,Element* element,int control_type,int control_index){/*{{{*/
+void           SmoothAnalysis::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