Index: sm/trunk-jpl/src/m/classes/SMB.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/SMB.m	(revision 19642)
+++ 	(revision )
@@ -1,58 +1,0 @@
-%SMB Class definition
-%
-%   Usage:
-%      SMB=SMB();
-
-classdef SMB
-	properties (SetAccess=public) 
-		mass_balance = NaN;
-	end
-	methods
-        function createxml(self,fid) % {{{
-            fprintf(fid, '\n\n');
-            fprintf(fid, '%s\n', '<!-- surfaceforcings(SMB) -->');
-			 fprintf(fid,'%s%s%s%s%s\n%s\n%s\n','<parameter key ="mass_balance" type="',class(self.mass_balance),'" default="',self.mass_balance,'">','     <section name="surfaceforcings(SMB)" />','     <help> surface mass balance [m/yr ice eq] </help>','</parameter>');
-           
-        end % }}}
-		function self = SMB(varargin) % {{{
-			switch nargin
-				case 0
-				otherwise
-					error('constructor not supported');
-			end
-		end % }}}
-		function self = extrude(self,md) % {{{
-
-			self.mass_balance=project3d(md,'vector',self.mass_balance,'type','node');
-
-		end % }}}
-		function self = initialize(self,md) % {{{
-
-			if isnan(self.mass_balance)
-				self.mass_balance=zeros(md.mesh.numberofvertices,1);
-				disp('      no surfaceforcings.mass_balance specified: values set as zero');
-			end
-
-		end % }}}
-		function md = checkconsistency(self,md,solution,analyses) % {{{
-
-			if ismember(MasstransportAnalysisEnum(),analyses),
-				md = checkfield(md,'fieldname','surfaceforcings.mass_balance','timeseries',1,'NaN',1);
-			end
-			if ismember(BalancethicknessAnalysisEnum(),analyses),
-				md = checkfield(md,'fieldname','surfaceforcings.mass_balance','size',[md.mesh.numberofvertices 1],'NaN',1);
-			end
-		end % }}}
-		function disp(self) % {{{
-			disp(sprintf('   surface forcings parameters:'));
-			fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]');
-		end % }}}
-		function marshall(self,md,fid) % {{{
-
-			yts=365.0*24.0*3600.0;
-
-			WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer');
-			WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1);
-		end % }}}
-	end
-end
Index: sm/trunk-jpl/src/m/classes/SMB.py
===================================================================
--- /issm/trunk-jpl/src/m/classes/SMB.py	(revision 19642)
+++ 	(revision )
@@ -1,53 +1,0 @@
-import numpy
-from fielddisplay import fielddisplay
-from EnumDefinitions import *
-from checkfield import checkfield
-from WriteData import WriteData
-from project3d import project3d
-
-class SMB(object):
-	"""
-	SMB Class definition
-
-	   Usage:
-	      SMB=SMB();
-	"""
-
-	def __init__(self): # {{{
-		self.mass_balance = float('NaN')
-		#}}}
-	def __repr__(self): # {{{
-		string="   surface forcings parameters:"
-		string="%s\n%s"%(string,fielddisplay(self,'mass_balance','surface mass balance [m/yr ice eq]'))
-		return string
-		#}}}
-	def extrude(self,md): # {{{
-
-		self.mass_balance=project3d(md,'vector',self.mass_balance,'type','node');
-		return self
-	#}}}
-	def initialize(self,md): # {{{
-
-		if numpy.all(numpy.isnan(self.mass_balance)):
-			self.mass_balance=numpy.zeros((md.mesh.numberofvertices,1))
-			print "      no SMB.mass_balance specified: values set as zero"
-
-		return self
-	#}}}
-	def checkconsistency(self,md,solution,analyses):    # {{{
-
-		if MasstransportAnalysisEnum() in analyses:
-			md = checkfield(md,'fieldname','surfaceforcings.mass_balance','timeseries',1,'NaN',1)
-
-		if BalancethicknessAnalysisEnum() in analyses:
-			md = checkfield(md,'fieldname','surfaceforcings.mass_balance','size',[md.mesh.numberofvertices],'NaN',1)
-
-		return md
-	# }}}
-	def marshall(self,md,fid):    # {{{
-
-		yts=365.0*24.0*3600.0
-
-		WriteData(fid,'enum',SurfaceforcingsEnum(),'data',SMBEnum(),'format','Integer');
-		WriteData(fid,'object',self,'class','surfaceforcings','fieldname','mass_balance','format','DoubleMat','mattype',1,'scale',1./yts,'timeserieslength',md.mesh.numberofvertices+1)
-	# }}}
Index: /issm/trunk-jpl/src/m/classes/oldclasses/SMB.m
===================================================================
--- /issm/trunk-jpl/src/m/classes/oldclasses/SMB.m	(revision 19643)
+++ /issm/trunk-jpl/src/m/classes/oldclasses/SMB.m	(revision 19643)
@@ -0,0 +1,10 @@
+%SMB Class definition
+%
+%   Usage:
+%      SMB=SMB();
+
+classdef SMB
+	properties (SetAccess=public) 
+		mass_balance = NaN;
+	end
+end
