Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp
===================================================================
--- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp	(revision 22535)
+++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp	(revision 22536)
@@ -131,4 +131,5 @@
 void UpdateElementsAndMaterialsControl(Elements* elements,Materials* materials, IoModel* iomodel){
 
+
 	/*Intermediaries*/
 	int				num_independent_objects,M,N;
@@ -138,8 +139,14 @@
 	IssmDouble**	independents_min			= NULL;
 	IssmDouble**	independents_max			= NULL;
+	bool				control_analysis			=false;
+
+	iomodel->FindConstant(&control_analysis,"md.inversion.iscontrol");
+	
+	/*Now, return if no control*/
+	if(!control_analysis) return;
 
 	/*Step1: create controls (independents)*/
 	iomodel->FetchData(&num_independent_objects,"md.autodiff.num_independent_objects");
-//_assert_(num_independent_objects>0); 
+	_assert_(num_independent_objects>0); 
 	iomodel->FetchData(&names,&M,"md.autodiff.independent_object_names");
 	_assert_(M==num_independent_objects);