Index: /issm/trunk/src/ad/Makefile.am
===================================================================
--- /issm/trunk/src/ad/Makefile.am	(revision 9784)
+++ /issm/trunk/src/ad/Makefile.am	(revision 9785)
@@ -38,8 +38,4 @@
 					./objects/Material.h\
 					./objects/Load.h\
-					./objects/Contour.h\
-					./objects/Contour.cpp\
-					./objects/OptArgs.h\
-					./objects/OptPars.h\
 					./objects/Loads/Friction.h\
 					./objects/Loads/Friction.cpp\
@@ -165,6 +161,4 @@
 					./Container/Nodes.h\
 					./Container/Nodes.cpp\
-					./Container/Options.h\
-					./Container/Options.cpp\
 					./Container/Parameters.h\
 					./Container/Parameters.cpp\
@@ -276,6 +270,4 @@
 					./modules/InputScalex/InputScalex.h\
 					./modules/InputScalex/InputScalex.cpp\
-					./modules/SurfaceAreax/SurfaceAreax.h\
-					./modules/SurfaceAreax/SurfaceAreax.cpp\
 					./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.h\
 					./modules/CreateNodalConstraintsx/CreateNodalConstraintsx.cpp\
@@ -325,6 +317,4 @@
 					./modules/ConstraintsStatex/ConstraintsStatex.h\
 					./modules/ConstraintsStatex/ConstraintsStateLocal.h\
-					./modules/Responsex/Responsex.h\
-					./modules/Responsex/Responsex.cpp\
 					./modules/RequestedOutputsx/RequestedOutputsx.h\
 					./modules/RequestedOutputsx/RequestedOutputsx.cpp\
@@ -472,5 +462,8 @@
 					  ./shared/Numerics/BrentSearch.cpp\
 					  ./shared/Numerics/OptimalSearch.cpp\
-					  ./shared/Numerics/OptFunc.cpp
+					  ./shared/Numerics/OptFunc.cpp\
+					  ./objects/OptArgs.h\
+					  ./objects/OptPars.h
+
 endif
 #}}}
@@ -539,5 +532,9 @@
 					  ./modules/RheologyBbarx/RheologyBbarx.h\
 					  ./modules/MassFluxx/MassFluxx.cpp\
-					  ./modules/MassFluxx/MassFluxx.h
+					  ./modules/MassFluxx/MassFluxx.h\
+					  ./modules/SurfaceAreax/SurfaceAreax.h\
+					  ./modules/SurfaceAreax/SurfaceAreax.cpp\
+					  ./modules/Responsex/Responsex.h\
+					  ./modules/Responsex/Responsex.cpp
 endif
 #}}}
Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 9784)
+++ /issm/trunk/src/c/Makefile.am	(revision 9785)
@@ -1050,23 +1050,23 @@
 if DAKOTA
 libpISSM_a_SOURCES +=  ./objects/DakotaPlugin.h\
-					  ./objects/DakotaPlugin.cpp\
-					  ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\
-					  ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\
-					  ./modules/DakotaResponsesx/DakotaResponsesx.h\
-					  ./modules/DakotaResponsesx/DakotaResponsesx.cpp\
-					  ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\
-					  ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\
-					  ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
-					  ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
-					  ./modules/Dakotax/Dakotax.h\
-					  ./modules/Dakotax/Dakotax.cpp\
-					  ./modules/Dakotax/DakotaMPI_Bcast.cpp\
-					  ./modules/Dakotax/DakotaFree.cpp\
-					  ./modules/Dakotax/SpawnCore.cpp\
-					  ./modules/Dakotax/SpawnCoreParallel.cpp\
-					  ./modules/Dakotax/DescriptorIndex.cpp\
-					  ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
-					  ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\
-					  ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h
+					   ./objects/DakotaPlugin.cpp\
+					   ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\
+					   ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\
+					   ./modules/DakotaResponsesx/DakotaResponsesx.h\
+					   ./modules/DakotaResponsesx/DakotaResponsesx.cpp\
+					   ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\
+					   ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\
+					   ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
+					   ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\
+					   ./modules/Dakotax/Dakotax.h\
+					   ./modules/Dakotax/Dakotax.cpp\
+					   ./modules/Dakotax/DakotaMPI_Bcast.cpp\
+					   ./modules/Dakotax/DakotaFree.cpp\
+					   ./modules/Dakotax/SpawnCore.cpp\
+					   ./modules/Dakotax/SpawnCoreParallel.cpp\
+					   ./modules/Dakotax/DescriptorIndex.cpp\
+					   ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\
+					   ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\
+					   ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h
 endif
 #}}}
Index: /issm/trunk/src/c/objects/Loads/Icefront.cpp
===================================================================
--- /issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 9784)
+++ /issm/trunk/src/c/objects/Loads/Icefront.cpp	(revision 9785)
@@ -340,10 +340,14 @@
 	/*Just branch to the correct element icefront vector generator, according to the type of analysis we are carrying out: */
 	switch(analysis_type){
+		#ifdef _HAVE_DIAGNOSTIC_
 		case DiagnosticHorizAnalysisEnum:
 			pe=CreatePVectorDiagnosticHoriz();
 			break;
+		#endif
+		#ifdef _HAVE_CONTROL_
 		case AdjointHorizAnalysisEnum:
 			pe=CreatePVectorAdjointHoriz();
 			break;
+		#endif
 		default:
 			_error_("analysis %i (%s) not supported yet",analysis_type,EnumToStringx(analysis_type));
@@ -429,4 +433,5 @@
 
 /*Icefront numerics: */
+#ifdef _HAVE_DIAGNOSTIC_
 /*FUNCTION Icefront::CreatePVectorDiagnosticHoriz {{{1*/
 ElementVector* Icefront::CreatePVectorDiagnosticHoriz(void){
@@ -449,11 +454,4 @@
 			_error_("Icefront type %s not supported yet",EnumToStringx(type));
 	}
-}
-/*}}}*/
-/*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{1*/
-ElementVector* Icefront::CreatePVectorAdjointHoriz(void){
-
-	/*No load vector applied to the adjoint*/
-	return NULL;
 }
 /*}}}*/
@@ -536,4 +534,14 @@
 }
 /*}}}*/
+#endif
+#ifdef _HAVE_CONTROL_
+/*FUNCTION Icefront::CreatePVectorAdjointHoriz {{{1*/
+ElementVector* Icefront::CreatePVectorAdjointHoriz(void){
+
+	/*No load vector applied to the adjoint*/
+	return NULL;
+}
+/*}}}*/
+#endif
 #ifdef _HAVE_THREED_
 /*FUNCTION Icefront::CreatePVectorDiagnosticMacAyeal3d{{{1*/
Index: /issm/trunk/src/c/objects/Loads/Icefront.h
===================================================================
--- /issm/trunk/src/c/objects/Loads/Icefront.h	(revision 9784)
+++ /issm/trunk/src/c/objects/Loads/Icefront.h	(revision 9785)
@@ -80,7 +80,14 @@
 		/*}}}*/
 		/*Load management: {{{1*/
+		void  GetDofList(int** pdoflist,int approximation_enum,int setenum);
+		void GetSegmentNormal(double* normal,double xyz_list[2][3]);
+		void GetQuadNormal(double* normal,double xyz_list[4][3]);
+		#ifdef _HAVE_CONTROL_
 		ElementVector* CreatePVectorAdjointHoriz(void);
+		#endif
+		#ifdef _HAVE_DIAGNOSTIC_
 		ElementVector* CreatePVectorDiagnosticHoriz(void);
 		ElementVector* CreatePVectorDiagnosticMacAyeal2d(void);
+		#endif
         #ifdef _HAVE_THREED_
 		ElementVector* CreatePVectorDiagnosticMacAyeal3d(void);
@@ -88,7 +95,4 @@
 		ElementVector* CreatePVectorDiagnosticStokes(void);
 	    #endif
-		void  GetDofList(int** pdoflist,int approximation_enum,int setenum);
-		void GetSegmentNormal(double* normal,double xyz_list[2][3]);
-		void GetQuadNormal(double* normal,double xyz_list[4][3]);
 		/*}}}*/
 };