Changeset 15143

Timestamp:

05/29/13 14:50:26 (12 years ago)

Author:

adhikari

Message:

CHG: removed gia irate

Location:

issm/trunk-jpl/src/m/classes

Files:

• gia.m (modified) (5 diffs)
• gia.py (modified) (5 diffs)

issm/trunk-jpl/src/m/classes/gia.m

@@ -8 +8 @@
                 mantle_viscosity              = NaN;
                 lithosphere_thickness         = NaN;
-                output_rates                  = 0;
                 cross_section_shape           = 0;
         end
@@ -21 +20 @@
                 end % }}}
                 function obj = setdefaultparameters(obj) % {{{
-                obj.output_rates=1;  %don't output  rates by default (see irate in GiaDeflectionCorex)
                 obj.cross_section_shape=1; %square as default (see iedge in GiaDeflectionCorex)
                 end % }}}
@@ -29 +27 @@
                         md = checkfield(md,'gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
                         md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices 1],'>',0);
-                        md = checkfield(md,'gia.output_rates','numel',[1],'values',[1,2]);
                         md = checkfield(md,'gia.cross_section_shape','numel',[1],'values',[1,2]);
 
@@ -53 +50 @@
                         fielddisplay(obj,'mantle_viscosity','mantle viscosity[Pa s]');
                         fielddisplay(obj,'lithosphere_thickness','lithosphere thickness (km)');
-                        fielddisplay(obj,'output_rates','1: fetch w solution (m) (default). 2: fetch dw/dt (mm/yr). See irate in GiaDeflectionCore');
                         fielddisplay(obj,'cross_section_shape','1: square-edged (default). 2: elliptical.  See iedge in GiaDeflectionCore');
 
@@ -60 +56 @@
                         WriteData(fid,'object',obj,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
                         WriteData(fid,'object',obj,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10^3); %from km to m
-                        WriteData(fid,'object',obj,'fieldname','output_rates','format','Integer');
                         WriteData(fid,'object',obj,'fieldname','cross_section_shape','format','Integer');
                 end % }}}

issm/trunk-jpl/src/m/classes/gia.py

@@ -15 +15 @@
                 self.mantle_viscosity              = float('NaN');
                 self.lithosphere_thickness         = float('NaN');
-                self.output_rates                  = 0;
                 self.cross_section_shape           = 0;
         
@@ -28 +27 @@
                 string="%s\n%s"%(string,fielddisplay(self,'mantle_viscosity','mantle viscosity constraints (NaN means no constraint) (Pa s)'))
                 string="%s\n%s"%(string,fielddisplay(self,'lithosphere_thickness','lithosphere thickness constraints (NaN means no constraint) (m)'))
-                string="%s\n%s"%(string,fielddisplay(self,'output_rates','1: deflection (w) (m), 2: rate of deflection (dw/dt) (mm/yr)'))
                 string="%s\n%s"%(string,fielddisplay(self,'cross_section_shape',"1: square-edged, 2: elliptical-edged surface"))
                 return string
@@ -34 +32 @@
         def setdefaultparameters(self): # {{{
 
-                self.output_rates=1;  
                 self.cross_section_shape=1; 
 
@@ -47 +44 @@
                 md = checkfield(md,'gia.mantle_viscosity','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
                 md = checkfield(md,'gia.lithosphere_thickness','NaN',1,'size',[md.mesh.numberofvertices,1],'>',0)
-                md = checkfield(md,'gia.output_rates','numel',[1],'values',[1,2])
                 md = checkfield(md,'gia.cross_section_shape','numel',[1],'values',[1,2])
 
@@ -59 +55 @@
                 WriteData(fid,'object',self,'fieldname','mantle_viscosity','format','DoubleMat','mattype',1);
                 WriteData(fid,'object',self,'fieldname','lithosphere_thickness','format','DoubleMat','mattype',1,'scale',10.**3.);
-                WriteData(fid,'object',self,'fieldname','output_rates','format','Integer');
                 WriteData(fid,'object',self,'fieldname','cross_section_shape','format','Integer');
         # }}}