Index: /issm/trunk-jpl/src/c/analyses/SamplingAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/SamplingAnalysis.cpp	(revision 26002)
+++ /issm/trunk-jpl/src/c/analyses/SamplingAnalysis.cpp	(revision 26003)
@@ -160,11 +160,9 @@
 	/*Retrieve all inputs and parameters*/
 	element->GetVerticesCoordinates(&xyz_list);
-	Input2*	kappa_input=element->GetInput2(SamplingKappaEnum); _assert_(kappa_input);
+	Input*	kappa_input=element->GetInput(SamplingKappaEnum); _assert_(kappa_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);
@@ -224,10 +222,9 @@
 	element->GetVerticesCoordinates(&xyz_list);
 	element->GetLevelCoordinates(&xyz_list_boundary,xyz_list,MeshVertexonboundaryEnum,1.);
-	Input2*	beta_input=element->GetInput2(SamplingBetaEnum); _assert_(beta_input);
+	Input*	beta_input=element->GetInput(SamplingBetaEnum); _assert_(beta_input);
 
 	/* Start  looping on the number of gaussian points: */
 	Gauss* gauss=element->NewGauss(xyz_list,xyz_list_boundary,3);
-	for(int ig=gauss->begin();ig<gauss->end();ig++){
-		gauss->GaussPoint(ig);
+	while(gauss->next()){
 
 		element->JacobianDeterminantSurface(&Jdet,xyz_list_boundary,gauss);
@@ -283,5 +280,5 @@
 
     /*Add sample inputs to the tria element: */
-    element->AddInput2(SampleEnum,newsample,element->GetElementType());
+    element->AddInput(SampleEnum,newsample,element->GetElementType());
 
     /*Free ressources:*/
@@ -315,6 +312,5 @@
 	/* 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);