Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp	(revision 22607)
+++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp	(revision 22608)
@@ -97,5 +97,4 @@
 		parameters->AddObject(iomodel->CopyConstantObject("md.damage.c2",DamageC2Enum));
 		parameters->AddObject(iomodel->CopyConstantObject("md.damage.c3",DamageC3Enum));
-		parameters->AddObject(iomodel->CopyConstantObject("md.damage.c4",DamageC4Enum));
 		parameters->AddObject(iomodel->CopyConstantObject("md.damage.stress_threshold",DamageStressThresholdEnum));
 		parameters->AddObject(iomodel->CopyConstantObject("md.damage.kappa",DamageKappaEnum));
Index: /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp
===================================================================
--- /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp	(revision 22607)
+++ /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp	(revision 22608)
@@ -161,5 +161,4 @@
 			parameters->AddObject(iomodel->CopyConstantObject("md.smb.swIdx",SmbSwIdxEnum));
 			parameters->AddObject(iomodel->CopyConstantObject("md.smb.denIdx",SmbDenIdxEnum));
-			parameters->AddObject(iomodel->CopyConstantObject("md.smb.outputFreq",SmbOutputFreqEnum));
 			parameters->AddObject(iomodel->CopyConstantObject("md.smb.cldFrac",SmbCldFracEnum));
 			parameters->AddObject(iomodel->CopyConstantObject("md.smb.t0wet",SmbT0wetEnum));
@@ -219,11 +218,9 @@
 			iomodel->FindConstant(&issetpddfac,"md.smb.issetpddfac");
 			if(isd18opd){
+				parameters->AddObject(iomodel->CopyConstantObject("md.smb.f",SmbFEnum));
 				parameters->AddObject(iomodel->CopyConstantObject("md.smb.istemperaturescaled",SmbIstemperaturescaledEnum));
 				iomodel->FetchData(&temp,&N,&M,"md.smb.delta18o"); _assert_(N==2);
 				parameters->AddObject(new TransientParam(SmbDelta18oEnum,&temp[0],&temp[M],interp,M));
 				iomodel->DeleteData(temp,"md.smb.delta18o");
-				
-				parameters->AddObject(iomodel->CopyConstantObject("md.smb.dpermil",SmbDpermilEnum));
-			   parameters->AddObject(iomodel->CopyConstantObject("md.smb.f",SmbFEnum));
 			}
 			break;
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 22607)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h	(revision 22608)
@@ -649,5 +649,4 @@
 	CuffeyEnum,
 	CuffeyTemperateEnum,
-	DamageC4Enum,
 	DamageEvolutionAnalysisEnum,
 	DamageEvolutionSolutionEnum,
@@ -935,5 +934,4 @@
 	SmbMAddEnum,
 	SMBmeltcomponentsEnum,
-	SmbOutputFreqEnum,
 	SMBpddEnum,
 	SmbRlapsEnum,
Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 22607)
+++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp	(revision 22608)
@@ -653,5 +653,4 @@
 		case CuffeyEnum : return "Cuffey";
 		case CuffeyTemperateEnum : return "CuffeyTemperate";
-		case DamageC4Enum : return "DamageC4";
 		case DamageEvolutionAnalysisEnum : return "DamageEvolutionAnalysis";
 		case DamageEvolutionSolutionEnum : return "DamageEvolutionSolution";
@@ -939,5 +938,4 @@
 		case SmbMAddEnum : return "SmbMAdd";
 		case SMBmeltcomponentsEnum : return "SMBmeltcomponents";
-		case SmbOutputFreqEnum : return "SmbOutputFreq";
 		case SMBpddEnum : return "SMBpdd";
 		case SmbRlapsEnum : return "SmbRlaps";
Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
===================================================================
--- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 22607)
+++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp	(revision 22608)
@@ -668,5 +668,4 @@
 	      else if (strcmp(name,"Cuffey")==0) return CuffeyEnum;
 	      else if (strcmp(name,"CuffeyTemperate")==0) return CuffeyTemperateEnum;
-	      else if (strcmp(name,"DamageC4")==0) return DamageC4Enum;
 	      else if (strcmp(name,"DamageEvolutionAnalysis")==0) return DamageEvolutionAnalysisEnum;
 	      else if (strcmp(name,"DamageEvolutionSolution")==0) return DamageEvolutionSolutionEnum;
@@ -752,9 +751,9 @@
 	      else if (strcmp(name,"Hook")==0) return HookEnum;
 	      else if (strcmp(name,"HydrologyBasalFlux")==0) return HydrologyBasalFluxEnum;
+	      else if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
          else stage=7;
    }
    if(stage==7){
-	      if (strcmp(name,"HydrologyDCEfficientAnalysis")==0) return HydrologyDCEfficientAnalysisEnum;
-	      else if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
+	      if (strcmp(name,"Hydrologydc")==0) return HydrologydcEnum;
 	      else if (strcmp(name,"HydrologydcEplColapseThickness")==0) return HydrologydcEplColapseThicknessEnum;
 	      else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum;
@@ -875,9 +874,9 @@
 	      else if (strcmp(name,"Mpi")==0) return MpiEnum;
 	      else if (strcmp(name,"MpiSparse")==0) return MpiSparseEnum;
+	      else if (strcmp(name,"Mumps")==0) return MumpsEnum;
          else stage=8;
    }
    if(stage==8){
-	      if (strcmp(name,"Mumps")==0) return MumpsEnum;
-	      else if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
+	      if (strcmp(name,"NewDamage")==0) return NewDamageEnum;
 	      else if (strcmp(name,"Nodal")==0) return NodalEnum;
 	      else if (strcmp(name,"Nodalvalue")==0) return NodalvalueEnum;
@@ -960,5 +959,4 @@
 	      else if (strcmp(name,"SmbMAdd")==0) return SmbMAddEnum;
 	      else if (strcmp(name,"SMBmeltcomponents")==0) return SMBmeltcomponentsEnum;
-	      else if (strcmp(name,"SmbOutputFreq")==0) return SmbOutputFreqEnum;
 	      else if (strcmp(name,"SMBpdd")==0) return SMBpddEnum;
 	      else if (strcmp(name,"SmbRlaps")==0) return SmbRlapsEnum;
@@ -998,10 +996,10 @@
 	      else if (strcmp(name,"ThicknessErrorEstimator")==0) return ThicknessErrorEstimatorEnum;
 	      else if (strcmp(name,"TotalFloatingBmb")==0) return TotalFloatingBmbEnum;
+	      else if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
+	      else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
          else stage=9;
    }
    if(stage==9){
-	      if (strcmp(name,"TotalFloatingBmbScaled")==0) return TotalFloatingBmbScaledEnum;
-	      else if (strcmp(name,"TotalGroundedBmb")==0) return TotalGroundedBmbEnum;
-	      else if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
+	      if (strcmp(name,"TotalGroundedBmbScaled")==0) return TotalGroundedBmbScaledEnum;
 	      else if (strcmp(name,"TotalSmb")==0) return TotalSmbEnum;
 	      else if (strcmp(name,"TotalSmbScaled")==0) return TotalSmbScaledEnum;
@@ -1121,10 +1119,10 @@
 	      else if (strcmp(name,"Outputdefinition90")==0) return Outputdefinition90Enum;
 	      else if (strcmp(name,"Outputdefinition91")==0) return Outputdefinition91Enum;
+	      else if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
+	      else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
          else stage=10;
    }
    if(stage==10){
-	      if (strcmp(name,"Outputdefinition92")==0) return Outputdefinition92Enum;
-	      else if (strcmp(name,"Outputdefinition93")==0) return Outputdefinition93Enum;
-	      else if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
+	      if (strcmp(name,"Outputdefinition94")==0) return Outputdefinition94Enum;
 	      else if (strcmp(name,"Outputdefinition95")==0) return Outputdefinition95Enum;
 	      else if (strcmp(name,"Outputdefinition96")==0) return Outputdefinition96Enum;