Index: /issm/trunk-jpl/src/m/classes/model.js
===================================================================
--- /issm/trunk-jpl/src/m/classes/model.js	(revision 19823)
+++ /issm/trunk-jpl/src/m/classes/model.js	(revision 19824)
@@ -18,5 +18,5 @@
 			console.log(sprintf("%19s: %-22s -- %s","friction"        ,"[1x1 " + typeof(this.friction) + "]","basal friction/drag properties"));
 			console.log(sprintf("%19s: %-22s -- %s","flowequation"    ,"[1x1 " + typeof(this.flowequation) + "]","flow equations"));
-			console.log(sprintf("%19s: %-22s -- %s","timestepping"    ,"[1x1 " + typeof(this.timestepping) + "]","time stepping for transient models"));
+			console.log(sprintf("%19s: %-22s -- %s","timestepping"    ,"[1x1 " + typeof(this.timestepping) + "]","time stepping for trans models"));
 			console.log(sprintf("%19s: %-22s -- %s","initialization"  ,"[1x1 " + typeof(this.initialization) + "]","initial guess/state"));
 			console.log(sprintf("%19s: %-22s -- %s","rifts"           ,"[1x1 " + typeof(this.rifts) + "]","rifts properties"));
@@ -33,5 +33,5 @@
 			console.log(sprintf("%19s: %-22s -- %s","thermal"         ,"[1x1 " + typeof(this.thermal) + "]","parameters for thermal solution"));
 			console.log(sprintf("%19s: %-22s -- %s","steadystate"     ,"[1x1 " + typeof(this.steadystate) + "]","parameters for steadystate solution"));
-			console.log(sprintf("%19s: %-22s -- %s","transient"       ,"[1x1 " + typeof(this.transient) + "]","parameters for transient solution"));
+			console.log(sprintf("%19s: %-22s -- %s","trans"       ,"[1x1 " + typeof(this.trans) + "]","parameters for trans solution"));
 			console.log(sprintf("%19s: %-22s -- %s","calving"         ,"[1x1 " + typeof(this.calving) + "]","parameters for calving"));
 			console.log(sprintf("%19s: %-22s -- %s","gia"             ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution"));
@@ -73,5 +73,5 @@
 			this.thermal          = new thermal();
 			this.steadystate      = new steadystate();
-			this.transient        = new transient();
+			this.trans            = new trans();
 			this.calving          = new calving();
 			this.gia              = new gia();
@@ -84,5 +84,5 @@
 			this.outputdefinition = new outputdefinition();
 			this.miscellaneous    = new miscellaneous();
-			this.private          = new private();
+			this.priv             = new priv();
 		} //}}}
 		this.checkmessage = function(string){ //{{{
@@ -121,5 +121,5 @@
 		this.thermal          = 0;
 		this.steadystate      = 0;
-		this.transient        = 0;
+		this.trans            = 0;
 		this.calving          = 0;
 		this.gia              = 0;
@@ -134,5 +134,5 @@
 		this.radaroverlay     = 0;
 		this.miscellaneous    = 0;
-		this.private          = 0;
+		this.priv             = 0;
 
 		//set default values for fields
Index: /issm/trunk-jpl/src/m/classes/priv.js
===================================================================
--- /issm/trunk-jpl/src/m/classes/priv.js	(revision 19824)
+++ /issm/trunk-jpl/src/m/classes/priv.js	(revision 19824)
@@ -0,0 +1,30 @@
+//PRIV class definition
+//
+//   Usage:
+//      priv =new priv();
+
+function priv (){
+	//methods
+	this.setdefaultparameters = function(){// {{{
+	}// }}}
+	this.disp= function(){// {{{
+		console.log(sprintf('   private parameters: do not change'));
+
+		fielddisplay(this,'isconsistent','is model this consistent');
+		fielddisplay(this,'runtimename','name of the run launched');
+		fielddisplay(this,'bamg','structure with mesh properties constructed if bamg is used to mesh the domain');
+		fielddisplay(this,'solution','type of solution launched');
+	}// }}}
+	this.checkconsistency = function(md,solution,analyses){ // {{{
+
+	}// % }}}
+	//properties 
+	// {{{
+	this.isconsistent = true;
+	this.runtimename  = '';
+	this.bamg         = {};
+	this.solution     = '';
+
+	this.setdefaultparameters();
+	//}}}
+}
Index: sm/trunk-jpl/src/m/classes/private.js
===================================================================
--- /issm/trunk-jpl/src/m/classes/private.js	(revision 19823)
+++ 	(revision )
@@ -1,30 +1,0 @@
-//PRIVATE class definition
-//
-//   Usage:
-//      private=new private();
-
-function private (){
-	//methods
-	this.setdefaultparameters = function(){// {{{
-	}// }}}
-	this.disp= function(){// {{{
-		console.log(sprintf('   private parameters: do not change'));
-
-		fielddisplay(this,'isconsistent','is model this consistent');
-		fielddisplay(this,'runtimename','name of the run launched');
-		fielddisplay(this,'bamg','structure with mesh properties constructed if bamg is used to mesh the domain');
-		fielddisplay(this,'solution','type of solution launched');
-	}// }}}
-	this.checkconsistency = function(md,solution,analyses){ // {{{
-
-	}// % }}}
-	//properties 
-	// {{{
-	this.isconsistent = true;
-	this.runtimename  = '';
-	this.bamg         = {};
-	this.solution     = '';
-
-	this.setdefaultparameters();
-	//}}}
-}
Index: /issm/trunk-jpl/src/m/classes/trans.js
===================================================================
--- /issm/trunk-jpl/src/m/classes/trans.js	(revision 19824)
+++ /issm/trunk-jpl/src/m/classes/trans.js	(revision 19824)
@@ -0,0 +1,108 @@
+//TRANS class definition
+//
+//   Usage:
+//      trans =new trans();
+
+function trans (){
+	//methods
+	this.setdefaultparameters = function(){// {{{
+
+		//full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
+		this.issmb           = 1;
+		this.ismasstransport = 1;
+		this.isstressbalance = 1;
+		this.isthermal       = 1;
+		this.isgroundingline = 0;
+		this.isgia           = 0;
+		this.isdamageevolution = 0;
+		this.islevelset      = 0;
+		this.iscalving       = 0;
+		this.ishydrology     = 0;
+
+		//default output
+		this.requested_outputs=['default'];
+
+	}// }}}
+	this.disp= function(){// {{{
+
+		console.log(sprintf('   transient solution parameters:'));
+
+		fielddisplay(this,'issmb','indicates whether a surface mass balance solution is used in the transient');
+		fielddisplay(this,'ismasstransport','indicates whether a masstransport solution is used in the transient');
+		fielddisplay(this,'isstressbalance','indicates whether a stressbalance solution is used in the transient');
+		fielddisplay(this,'isthermal','indicates whether a thermal solution is used in the transient');
+		fielddisplay(this,'isgroundingline','indicates whether a groundingline migration is used in the transient');
+		fielddisplay(this,'isgia','indicates whether a postglacial rebound model is used in the transient');
+		fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient');
+		fielddisplay(this,'islevelset','LEVEL SET DESCRIPTION...');
+		fielddisplay(this,'iscalving','indicates whether calving is used in the transient');
+		fielddisplay(this,'ishydrology','indicates whether an hydrology model is used');
+		fielddisplay(this,'requested_outputs','list of additional outputs requested');
+
+
+	}// }}}
+	this.classname= function(){// {{{
+		return "transient";
+	}// }}}
+		this.checkconsistency = function(md,solution,analyses) { // {{{
+
+			//Early return
+			if (solution!=TransientSolutionEnum()) return;
+
+			checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0 ,1]);
+			checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0 ,1]);
+			checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 ,1]);
+			checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 ,1]);
+			checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0, 1]);
+			checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0, 1]);
+			checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0, 1]);
+			checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0, 1]);
+			checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0, 1]);
+			checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 ,1]);
+			checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
+		} // }}}
+		this.marshall=function(md,fid) { //{{{
+			WriteData(fid,'object',this,'fieldname','issmb','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','ismasstransport','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','isstressbalance','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','isthermal','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','isgroundingline','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','isgia','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','isdamageevolution','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','ishydrology','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','islevelset','format','Boolean');
+			WriteData(fid,'object',this,'fieldname','iscalving','format','Boolean');
+
+			//process requested outputs
+			outputs = this.requested_outputs;
+			for (var i=0;i<outputs.length;i++){
+				if (outputs[i] == 'default') {
+					outputs.splice(i,1);
+					newoutputs=this.defaultoutputs(md);
+					for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]);
+				}
+			}			
+			WriteData(fid,'data',outputs,'enum',TransientRequestedOutputsEnum(),'format','StringArray');
+		}//}}}
+		this.defaultoutputs = function(md) { //{{{
+			if(this.issmb)return ['SmbMassBalance'];
+			else return [];
+		}//}}}
+	//properties 
+	// {{{
+
+	this.issmb             = 0;
+	this.ismasstransport   = 0;
+	this.isstressbalance   = 0;
+	this.isthermal         = 0;
+	this.isgroundingline   = 0;
+	this.isgia             = 0;
+	this.isdamageevolution = 0;
+	this.islevelset        = 0;
+	this.iscalving         = 0;
+	this.ishydrology       = 0;
+	this.requested_outputs = [];
+
+	this.setdefaultparameters();
+	//}}}
+}
Index: sm/trunk-jpl/src/m/classes/transient.js
===================================================================
--- /issm/trunk-jpl/src/m/classes/transient.js	(revision 19823)
+++ 	(revision )
@@ -1,108 +1,0 @@
-//TRANSIENT class definition
-//
-//   Usage:
-//      transient=new transient();
-
-function transient (){
-	//methods
-	this.setdefaultparameters = function(){// {{{
-
-		//full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now
-		this.issmb           = 1;
-		this.ismasstransport = 1;
-		this.isstressbalance = 1;
-		this.isthermal       = 1;
-		this.isgroundingline = 0;
-		this.isgia           = 0;
-		this.isdamageevolution = 0;
-		this.islevelset      = 0;
-		this.iscalving       = 0;
-		this.ishydrology     = 0;
-
-		//default output
-		this.requested_outputs=['default'];
-
-	}// }}}
-	this.disp= function(){// {{{
-
-		console.log(sprintf('   transient solution parameters:'));
-
-		fielddisplay(this,'issmb','indicates whether a surface mass balance solution is used in the transient');
-		fielddisplay(this,'ismasstransport','indicates whether a masstransport solution is used in the transient');
-		fielddisplay(this,'isstressbalance','indicates whether a stressbalance solution is used in the transient');
-		fielddisplay(this,'isthermal','indicates whether a thermal solution is used in the transient');
-		fielddisplay(this,'isgroundingline','indicates whether a groundingline migration is used in the transient');
-		fielddisplay(this,'isgia','indicates whether a postglacial rebound model is used in the transient');
-		fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient');
-		fielddisplay(this,'islevelset','LEVEL SET DESCRIPTION...');
-		fielddisplay(this,'iscalving','indicates whether calving is used in the transient');
-		fielddisplay(this,'ishydrology','indicates whether an hydrology model is used');
-		fielddisplay(this,'requested_outputs','list of additional outputs requested');
-
-
-	}// }}}
-	this.classname= function(){// {{{
-		return "transient";
-	}// }}}
-		this.checkconsistency = function(md,solution,analyses) { // {{{
-
-			//Early return
-			if (solution!=TransientSolutionEnum()) return;
-
-			checkfield(md,'fieldname','transient.issmb','numel',[1],'values',[0 ,1]);
-			checkfield(md,'fieldname','transient.ismasstransport','numel',[1],'values',[0 ,1]);
-			checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 ,1]);
-			checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 ,1]);
-			checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0, 1]);
-			checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0, 1]);
-			checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0, 1]);
-			checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0, 1]);
-			checkfield(md,'fieldname','transient.iscalving','numel',[1],'values',[0, 1]);
-			checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 ,1]);
-			checkfield(md,'fieldname','transient.requested_outputs','stringrow',1);
-		} // }}}
-		this.marshall=function(md,fid) { //{{{
-			WriteData(fid,'object',this,'fieldname','issmb','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','ismasstransport','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','isstressbalance','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','isthermal','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','isgroundingline','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','isgia','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','isdamageevolution','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','ishydrology','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','islevelset','format','Boolean');
-			WriteData(fid,'object',this,'fieldname','iscalving','format','Boolean');
-
-			//process requested outputs
-			outputs = this.requested_outputs;
-			for (var i=0;i<outputs.length;i++){
-				if (outputs[i] == 'default') {
-					outputs.splice(i,1);
-					newoutputs=this.defaultoutputs(md);
-					for (var j=0;j<newoutputs.length;j++) outputs.push(newoutputs[j]);
-				}
-			}			
-			WriteData(fid,'data',outputs,'enum',TransientRequestedOutputsEnum(),'format','StringArray');
-		}//}}}
-		this.defaultoutputs = function(md) { //{{{
-			if(this.issmb)return ['SmbMassBalance'];
-			else return [];
-		}//}}}
-	//properties 
-	// {{{
-
-	this.issmb             = 0;
-	this.ismasstransport   = 0;
-	this.isstressbalance   = 0;
-	this.isthermal         = 0;
-	this.isgroundingline   = 0;
-	this.isgia             = 0;
-	this.isdamageevolution = 0;
-	this.islevelset        = 0;
-	this.iscalving         = 0;
-	this.ishydrology       = 0;
-	this.requested_outputs = [];
-
-	this.setdefaultparameters();
-	//}}}
-}
Index: /issm/trunk-jpl/src/m/solve/loadresultsfrombuffer.js
===================================================================
--- /issm/trunk-jpl/src/m/solve/loadresultsfrombuffer.js	(revision 19823)
+++ /issm/trunk-jpl/src/m/solve/loadresultsfrombuffer.js	(revision 19824)
@@ -21,5 +21,5 @@
 		
 		//recover solution_type from results
-		md.private.solution=array['SolutionType'];
+		md.priv.solution=array['SolutionType'];
 	}
 	else throw Error('loadresultsfrombuffer error message: qmu results not supported yet!');
Index: /issm/trunk-jpl/src/m/solve/marshall.js
===================================================================
--- /issm/trunk-jpl/src/m/solve/marshall.js	(revision 19823)
+++ /issm/trunk-jpl/src/m/solve/marshall.js	(revision 19824)
@@ -22,5 +22,5 @@
 
 		//Some properties do not need to be marshalled
-		if (field == 'results' | field =='radaroverlay' | field == 'toolkits' | field =='cluster' | field == 'flaim' | field == 'private') continue;
+		if (field == 'results' | field =='radaroverlay' | field == 'toolkits' | field =='cluster' | field == 'flaim' | field == 'priv') continue;
 		
 		//Check that current field is a class
Index: /issm/trunk-jpl/src/m/solve/solve.js
===================================================================
--- /issm/trunk-jpl/src/m/solve/solve.js	(revision 19823)
+++ /issm/trunk-jpl/src/m/solve/solve.js	(revision 19824)
@@ -40,5 +40,5 @@
 
 	//recover some fields
-	md.private.solution=solutionenum;
+	md.priv.solution=solutionenum;
 	cluster=md.cluster;
 
@@ -49,8 +49,8 @@
 		}
 		if (solutionenum == FlaimSolutionEnum()){
-			md.private.isconsistent=true;
+			md.priv.isconsistent=true;
 			md.mesh.checkconsistency(md,solutionenum);
 			md.flaim.checkconsistency(md,solutionenum);
-			if (md.private.isconsistent==false){
+			if (md.priv.isconsistent==false){
 				throw error('solve error message: model not consistent, see messages above');
 			}
@@ -69,12 +69,12 @@
 	else{
 		if (!(restart == '')){
-			md.private.runtimename=restart;
+			md.priv.runtimename=restart;
 		}
 		else if (options.getfieldvalue('runtimename',true)){
 			c=new Date().getTime();
-			md.private.runtimename=sprintf('%s-%g',md.miscellaneous.name,c);
+			md.priv.runtimename=sprintf('%s-%g',md.miscellaneous.name,c);
 		}
 		else{
-			md.private.runtimename=md.miscellaneous.name;
+			md.priv.runtimename=md.miscellaneous.name;
 		}
 	}
@@ -96,5 +96,5 @@
 		throw  Error("solve error message: flaim runs not supported yet!");
 		//flaim_sol(md,options);
-		//md.private.solution=EnumToString(solutionenum);
+		//md.priv.solution=EnumToString(solutionenum);
 		//return;
 	}
@@ -114,5 +114,5 @@
 		throw Error('non local clusters not supported yet!');
 
-		cluster.BuildQueueScript(md.private.runtimename,md.miscellaneous.name,md.private.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof,md.qmu.isdakota); // queue file
+		cluster.BuildQueueScript(md.priv.runtimename,md.miscellaneous.name,md.priv.solution,md.settings.io_gather,md.debug.valgrind,md.debug.gprof,md.qmu.isdakota); // queue file
 
 		//Stop here if batch mode
@@ -140,9 +140,9 @@
 
 		if (restart == ''){
-			cluster.UploadQueueJob(md.miscellaneous.name,md.private.runtimename,filelist);
+			cluster.UploadQueueJob(md.miscellaneous.name,md.priv.runtimename,filelist);
 		}
 
 		//launch queue job: 
-		cluster.LaunchQueueJob(md.miscellaneous.name,md.private.runtimename,filelist,restart);
+		cluster.LaunchQueueJob(md.miscellaneous.name,md.priv.runtimename,filelist,restart);
 
 		//wait on lock
Index: /issm/trunk-jpl/test/NightlyRun/test101.html
===================================================================
--- /issm/trunk-jpl/test/NightlyRun/test101.html	(revision 19823)
+++ /issm/trunk-jpl/test/NightlyRun/test101.html	(revision 19824)
@@ -41,5 +41,5 @@
 <script type="text/javascript" src="../../src/m/classes/outputdefinition.js"></script>
 <script type="text/javascript" src="../../src/m/classes/miscellaneous.js"></script>
-<script type="text/javascript" src="../../src/m/classes/private.js"></script>
+<script type="text/javascript" src="../../src/m/classes/priv.js"></script>
 <script type="text/javascript" src="../../src/m/classes/steadystate.js"></script>
 <script type="text/javascript" src="../../src/m/classes/rifts.js"></script>
@@ -47,5 +47,5 @@
 <script type="text/javascript" src="../../src/m/classes/plotoptions.js"></script>
 <script type="text/javascript" src="../../src/m/classes/pairoptions.js"></script>
-<script type="text/javascript" src="../../src/m/classes/transient.js"></script>
+<script type="text/javascript" src="../../src/m/classes/trans.js"></script>
 <script type="text/javascript" src="../../src/m/boundaryconditions/SetIceShelfBC.js"></script>
 <script type="text/javascript" src="../../src/m/parameterization/setflowequation.js"></script>