Index: /issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp
===================================================================
--- /issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 5419)
+++ /issm/trunk/src/c/modules/ConfigureObjectsx/ConfigureObjectsx.cpp	(revision 5420)
@@ -19,8 +19,8 @@
 	Node* node=NULL;
 	Material* material=NULL;
-	int analysis_type;
+	int configuration_type;
 
 	/*Get analysis type: */
-	parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+	parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 	
 	//_printf_("      Configuring elements...\n");
@@ -32,5 +32,5 @@
 	for (i=0;i<loads->Size();i++){
 		load=(Load*)loads->GetObjectByOffset(i);
-		if (load->InAnalysis(analysis_type)){
+		if (load->InAnalysis(configuration_type)){
 			load->Configure(elements,loads,nodes,vertices,materials,parameters);
 		}
@@ -39,5 +39,5 @@
 	for (i=0;i<nodes->Size();i++){
 		node=(Node*)nodes->GetObjectByOffset(i);
-		if(node->InAnalysis(analysis_type)){
+		if(node->InAnalysis(configuration_type)){
 			node->Configure(nodes,vertices);
 		}
Index: /issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingConstraints.cpp
===================================================================
--- /issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingConstraints.cpp	(revision 5419)
+++ /issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingConstraints.cpp	(revision 5420)
@@ -11,5 +11,5 @@
 #include "./PenaltyConstraintsLocal.h"
 
-void  MeltingConstraints(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int analysis_type){
+void  MeltingConstraints(Loads* loads, int* pconverged, int* pnum_unstable_constraints,int configuration_type){
 
 	int i;
@@ -26,5 +26,5 @@
 		Object* object=(Object*)loads->GetObjectByOffset(i);
 		Load* load=(Load*)object;
-		if(load->InAnalysis(analysis_type)){
+		if(load->InAnalysis(configuration_type)){
 			if(object->Enum()==PengridEnum){
 
Index: /issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingIsPresent.cpp
===================================================================
--- /issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingIsPresent.cpp	(revision 5419)
+++ /issm/trunk/src/c/modules/PenaltyConstraintsx/MeltingIsPresent.cpp	(revision 5420)
@@ -11,5 +11,5 @@
 #include "./PenaltyConstraintsLocal.h"
 
-int MeltingIsPresent(Loads* loads,int analysis_type){
+int MeltingIsPresent(Loads* loads,int configuration_type){
 
 	int i;
@@ -20,5 +20,5 @@
 		Object* object=(Object*)loads->GetObjectByOffset(i);
 		Load* load=(Load*)object;
-		if(load->InAnalysis(analysis_type)){
+		if(load->InAnalysis(configuration_type)){
 			if (object->Enum()==PengridEnum){
 				found=1;
Index: /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp
===================================================================
--- /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp	(revision 5419)
+++ /issm/trunk/src/c/modules/PenaltyConstraintsx/RiftConstraints.cpp	(revision 5420)
@@ -11,6 +11,6 @@
 
 /*current module: */
-/*RiftIsPresent(Loads* loads,int analysis_type){{{1*/
-int RiftIsPresent(Loads* loads,int analysis_type){
+/*RiftIsPresent(Loads* loads,int configuration_type){{{1*/
+int RiftIsPresent(Loads* loads,int configuration_type){
 
 
@@ -23,5 +23,5 @@
 	for (i=0;i<loads->Size();i++){
 		Load* load=(Load*)loads->GetObjectByOffset(i);
-		if(load->InAnalysis(analysis_type)){
+		if(load->InAnalysis(configuration_type)){
 			if(RiftfrontEnum==loads->GetEnum(i)){
 				found=1;
@@ -40,6 +40,6 @@
 }
 /*}}}*/
-/*RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type){{{1*/
-void RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int analysis_type){
+/*RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){{{1*/
+void RiftConstraints(int* pconverged, int* pnum_unstable_constraints,Loads* loads,int min_mechanical_constraints,int configuration_type){
 
 	int num_unstable_constraints=0;
@@ -47,8 +47,8 @@
 	int potential;
 
-	RiftConstrain(&num_unstable_constraints,loads,analysis_type);
+	RiftConstrain(&num_unstable_constraints,loads,configuration_type);
 	if(num_unstable_constraints==0)converged=1;
 	
-	if(RiftIsFrozen(loads,analysis_type)){
+	if(RiftIsFrozen(loads,configuration_type)){
 		converged=1;
 		num_unstable_constraints=0;
@@ -56,5 +56,5 @@
 	else if(num_unstable_constraints<=min_mechanical_constraints){
 		_printf_("   freezing constraints\n");
-		RiftFreezeConstraints(loads,analysis_type);
+		RiftFreezeConstraints(loads,configuration_type);
 	}
 
@@ -64,6 +64,6 @@
 }
 /*}}}*/
-/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type){{{1*/
-void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int analysis_type){
+/*RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){{{1*/
+void RiftConstrain(int* pnum_unstable_constraints,Loads* loads,int configuration_type){
 
 	int			i;
@@ -83,5 +83,5 @@
 
 			load=(Load*)loads->GetObjectByOffset(i);
-			if(load->InAnalysis(analysis_type)){
+			if(load->InAnalysis(configuration_type)){
 
 				riftfront=(Riftfront*)load;
@@ -105,6 +105,6 @@
 }
 /*}}}*/
-/*RiftIsFrozen(Loads* loads,int analysis_type){{{1*/
-int RiftIsFrozen(Loads* loads,int analysis_type){
+/*RiftIsFrozen(Loads* loads,int configuration_type){{{1*/
+int RiftIsFrozen(Loads* loads,int configuration_type){
 
 	int			i;
@@ -122,5 +122,5 @@
 			
 			load=(Load*)loads->GetObjectByOffset(i);
-			if(load->InAnalysis(analysis_type)){
+			if(load->InAnalysis(configuration_type)){
 
 				riftfront=(Riftfront*)load;
@@ -143,6 +143,6 @@
 }
 /*}}}*/
-/*RiftFreezeConstraints(Loads* loads,int analysis_type){{{1*/
-void RiftFreezeConstraints(Loads* loads,int analysis_type){
+/*RiftFreezeConstraints(Loads* loads,int configuration_type){{{1*/
+void RiftFreezeConstraints(Loads* loads,int configuration_type){
 
 	int			i;
@@ -158,5 +158,5 @@
 
 			load=(Load*)loads->GetObjectByOffset(i);
-			if(load->InAnalysis(analysis_type)){
+			if(load->InAnalysis(configuration_type)){
 				
 				riftfront=(Riftfront*)load;
Index: /issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp
===================================================================
--- /issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp	(revision 5419)
+++ /issm/trunk/src/c/modules/PenaltySystemMatricesx/PenaltySystemMatricesx.cpp	(revision 5420)
@@ -16,8 +16,8 @@
 	Load* load=NULL;
 	
-	int analysis_type;
+	int configuration_type;
 
 	/*retrive parameters: */
-	parameters->FindParam(&analysis_type,AnalysisTypeEnum);
+	parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
 
 	/*Now, figure out maximum value of K_gg, so that we can penalize it correctly: */
@@ -30,5 +30,5 @@
 		for (i=0;i<loads->Size();i++){
 			load=(Load*)loads->GetObjectByOffset(i);
-			if (load->InAnalysis(analysis_type)) load->PenaltyCreateKMatrix(Kgg,kmax);
+			if (load->InAnalysis(configuration_type)) load->PenaltyCreateKMatrix(Kgg,kmax);
 		}
 
@@ -45,5 +45,5 @@
 		for (i=0;i<loads->Size();i++){
 			load=(Load*)loads->GetObjectByOffset(i);
-			if (load->InAnalysis(analysis_type)) load->PenaltyCreatePVector(pg,kmax);
+			if (load->InAnalysis(configuration_type)) load->PenaltyCreatePVector(pg,kmax);
 		}
 
Index: /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp
===================================================================
--- /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp	(revision 5419)
+++ /issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp	(revision 5420)
@@ -38,5 +38,5 @@
 
 	/*Get numberofdofspernode: */
-	numberofdofspernode=nodes->MaxNumDofs(analysis_type);
+	numberofdofspernode=nodes->MaxNumDofs(configuration_type);
 
 	/*Compute stiffness matrix*/
@@ -52,8 +52,8 @@
 		}
 
-		/*Fill stiffness matrix from loads if loads have the current analysis_type: */
+		/*Fill stiffness matrix from loads if loads have the current configuration_type: */
 		for (i=0;i<loads->Size();i++){
 			load=(Load*)loads->GetObjectByOffset(i);
-			if (load->InAnalysis(analysis_type)) load->CreateKMatrix(Kgg);
+			if (load->InAnalysis(configuration_type)) load->CreateKMatrix(Kgg);
 		}
 
@@ -76,8 +76,8 @@
 		}
 
-		/*Fill right hand side from loads if loads have the current analysis_type: */
+		/*Fill right hand side from loads if loads have the current configuration_type: */
 		for (i=0;i<loads->Size();i++){
 			load=(Load*)loads->GetObjectByOffset(i);
-			if (load->InAnalysis(analysis_type)) load->CreatePVector(pg);
+			if (load->InAnalysis(configuration_type)) load->CreatePVector(pg);
 		}