Index: /issm/trunk-jpl/src/c/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/c/Makefile.am	(revision 20453)
+++ /issm/trunk-jpl/src/c/Makefile.am	(revision 20454)
@@ -257,5 +257,5 @@
 					./cores/damage_core.cpp\
 					./cores/levelsetfunctionslope_core.cpp\
-					./cores/levelset_core.cpp\
+					./cores/movingfront_core.cpp\
 					./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\
 					./classes/Loads/Riftfront.cpp\
Index: /issm/trunk-jpl/src/c/cores/cores.h
===================================================================
--- /issm/trunk-jpl/src/c/cores/cores.h	(revision 20453)
+++ /issm/trunk-jpl/src/c/cores/cores.h	(revision 20454)
@@ -24,5 +24,5 @@
 void surfaceslope_core(FemModel* femmodel);
 void levelsetfunctionslope_core(FemModel* femmodel);
-void levelset_core(FemModel* femmodel);
+void movingfront_core(FemModel* femmodel);
 void bedslope_core(FemModel* femmodel);
 void meshdeformation_core(FemModel* femmodel);
Index: sm/trunk-jpl/src/c/cores/levelset_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/levelset_core.cpp	(revision 20453)
+++ 	(revision )
@@ -1,78 +1,0 @@
-/*!\file: levelset_core.cpp
- * \brief: levelset-module to update the ice domain
- */ 
-
-#include "./cores.h"
-#include "../toolkits/toolkits.h"
-#include "../classes/classes.h"
-#include "../shared/shared.h"
-#include "../solutionsequences/solutionsequences.h"
-#include "../modules/modules.h"
-
-void levelset_core(FemModel* femmodel){
-
-	/* intermediaries */
-	bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,ismovingfront;
-	int domaintype, num_extrapol_vars, index;
-	int* extrapol_vars=NULL;
-	Analysis  *analysis=NULL;
-
-	/* recover parameters */
-	femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
-	femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
-	femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);
-	femmodel->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum);
-	femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
-	femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
-	femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum);
-	if(isthermal && domaintype==Domain3DEnum) femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
-
-	if(!islevelset) return;
-
-	/* start the work from here */
-	if(ismovingfront) Calvingx(femmodel);
-	if(VerboseSolution()) _printf0_("   computing levelset transport\n");
-	/* smoothen slope of lsf for computation of normal on ice domain*/
-	levelsetfunctionslope_core(femmodel);
-
-	/* determine variables for extrapolation */
-	num_extrapol_vars=0;
-	if(isstressbalance) num_extrapol_vars+=2;
-	if(ismasstransport) num_extrapol_vars+=1;
-	if(isthermal && domaintype==Domain3DEnum) num_extrapol_vars+=1;
-	extrapol_vars=xNew<int>(num_extrapol_vars);
-	index=0;
-	if(isstressbalance){
-		extrapol_vars[index]=VxEnum; index++;
-		extrapol_vars[index]=VyEnum; index++;
-	}
-	if(ismasstransport){extrapol_vars[index]=ThicknessEnum; index++;}
-	if(isthermal && domaintype==Domain3DEnum){
-		if(isenthalpy){extrapol_vars[index]=EnthalpyEnum;}
-		else{extrapol_vars[index]=TemperatureEnum;}
-		index++;
-	}
-
-	/* extrapolate */
-	analysis = new ExtrapolationAnalysis();
-	for(int iv=0;iv<num_extrapol_vars;iv++){
-		femmodel->parameters->SetParam(extrapol_vars[iv],ExtrapolationVariableEnum); 
-		analysis->Core(femmodel);
-	}
-	xDelete<int>(extrapol_vars);
-	delete analysis;	
-
-	/* solve level set equation */
-	analysis = new LevelsetAnalysis();
-	analysis->Core(femmodel);
-	delete analysis;
-
-	/* update vertices included for next calculation */
-	GetMaskOfIceVerticesLSMx(femmodel);
-
-	/* add computation domain mask to outputs */
-	if(save_results){
-		int outputs[1] = {IceMaskNodeActivationEnum};
-		femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);
-	}
-}
Index: /issm/trunk-jpl/src/c/cores/movingfront_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/movingfront_core.cpp	(revision 20454)
+++ /issm/trunk-jpl/src/c/cores/movingfront_core.cpp	(revision 20454)
@@ -0,0 +1,78 @@
+/*!\file: levelset_core.cpp
+ * \brief: levelset-module to update the ice domain
+ */ 
+
+#include "./cores.h"
+#include "../toolkits/toolkits.h"
+#include "../classes/classes.h"
+#include "../shared/shared.h"
+#include "../solutionsequences/solutionsequences.h"
+#include "../modules/modules.h"
+
+void movingfront_core(FemModel* femmodel){
+
+	/* intermediaries */
+	bool save_results,isstressbalance,ismasstransport,isthermal,isenthalpy,islevelset,ismovingfront;
+	int domaintype, num_extrapol_vars, index;
+	int* extrapol_vars=NULL;
+	Analysis  *analysis=NULL;
+
+	/* recover parameters */
+	femmodel->parameters->FindParam(&domaintype,DomainTypeEnum);
+	femmodel->parameters->FindParam(&save_results,SaveResultsEnum);
+	femmodel->parameters->FindParam(&isstressbalance,TransientIsstressbalanceEnum);
+	femmodel->parameters->FindParam(&ismasstransport,TransientIsmasstransportEnum);
+	femmodel->parameters->FindParam(&isthermal,TransientIsthermalEnum);
+	femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum);
+	femmodel->parameters->FindParam(&ismovingfront,TransientIsmovingfrontEnum);
+	if(isthermal && domaintype==Domain3DEnum) femmodel->parameters->FindParam(&isenthalpy,ThermalIsenthalpyEnum);
+
+	if(!islevelset) return;
+
+	/* start the work from here */
+	if(ismovingfront) Calvingx(femmodel);
+	if(VerboseSolution()) _printf0_("   computing levelset transport\n");
+	/* smoothen slope of lsf for computation of normal on ice domain*/
+	levelsetfunctionslope_core(femmodel);
+
+	/* determine variables for extrapolation */
+	num_extrapol_vars=0;
+	if(isstressbalance) num_extrapol_vars+=2;
+	if(ismasstransport) num_extrapol_vars+=1;
+	if(isthermal && domaintype==Domain3DEnum) num_extrapol_vars+=1;
+	extrapol_vars=xNew<int>(num_extrapol_vars);
+	index=0;
+	if(isstressbalance){
+		extrapol_vars[index]=VxEnum; index++;
+		extrapol_vars[index]=VyEnum; index++;
+	}
+	if(ismasstransport){extrapol_vars[index]=ThicknessEnum; index++;}
+	if(isthermal && domaintype==Domain3DEnum){
+		if(isenthalpy){extrapol_vars[index]=EnthalpyEnum;}
+		else{extrapol_vars[index]=TemperatureEnum;}
+		index++;
+	}
+
+	/* extrapolate */
+	analysis = new ExtrapolationAnalysis();
+	for(int iv=0;iv<num_extrapol_vars;iv++){
+		femmodel->parameters->SetParam(extrapol_vars[iv],ExtrapolationVariableEnum); 
+		analysis->Core(femmodel);
+	}
+	xDelete<int>(extrapol_vars);
+	delete analysis;	
+
+	/* solve level set equation */
+	analysis = new LevelsetAnalysis();
+	analysis->Core(femmodel);
+	delete analysis;
+
+	/* update vertices included for next calculation */
+	GetMaskOfIceVerticesLSMx(femmodel);
+
+	/* add computation domain mask to outputs */
+	if(save_results){
+		int outputs[1] = {IceMaskNodeActivationEnum};
+		femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],1);
+	}
+}
Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp
===================================================================
--- /issm/trunk-jpl/src/c/cores/transient_core.cpp	(revision 20453)
+++ /issm/trunk-jpl/src/c/cores/transient_core.cpp	(revision 20454)
@@ -104,5 +104,5 @@
 		if(isdamageevolution) damage_core(femmodel);
 
-		if(islevelset)	levelset_core(femmodel);
+		if(islevelset)	movingfront_core(femmodel);
 
 		/* from here on, prepare geometry for next time step*/