Index: /issm/trunk-jpl/src/m/classes/geometry.js =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.js (revision 21583) +++ /issm/trunk-jpl/src/m/classes/geometry.js (revision 21584) @@ -29,5 +29,5 @@ this.checkconsistency = function(md,solution,analyses) { //{{{ - if ((solution=='TransientSolution' & md.trans.isgiaivins) | (solution=='GiaIvinsSolution')){ + if ((solution=='TransientSolution' & md.trans.isgia) | (solution=='GiaSolution')){ checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0); } Index: /issm/trunk-jpl/src/m/classes/geometry.m =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.m (revision 21583) +++ /issm/trunk-jpl/src/m/classes/geometry.m (revision 21584) @@ -53,5 +53,5 @@ function md = checkconsistency(self,md,solution,analyses) % {{{ - if (strcmp(solution,'TransientSolution') & md.transient.isgiaivins) | strcmp(solution,'GiaIvinsSolution'), + if (strcmp(solution,'TransientSolution') & md.transient.isgia) | strcmp(solution,'GiaSolution'), md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0); else Index: /issm/trunk-jpl/src/m/classes/geometry.py =================================================================== --- /issm/trunk-jpl/src/m/classes/geometry.py (revision 21583) +++ /issm/trunk-jpl/src/m/classes/geometry.py (revision 21584) @@ -45,5 +45,5 @@ def checkconsistency(self,md,solution,analyses): # {{{ - if (solution=='TransientSolution' and md.transient.isgiaivins) or (solution=='GiaIvinsSolution'): + if (solution=='TransientSolution' and md.transient.isgia) or (solution=='GiaSolution'): md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'>=',0,'timeseries',1) else: Index: /issm/trunk-jpl/src/m/classes/giaivins.js =================================================================== --- /issm/trunk-jpl/src/m/classes/giaivins.js (revision 21583) +++ /issm/trunk-jpl/src/m/classes/giaivins.js (revision 21584) @@ -27,11 +27,11 @@ if(!ArrayAnyEqual(ArrayIsMember('GiaAnalysis',analyses),1))return; - checkfield(md,'fieldname','giaivins.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0); - checkfield(md,'fieldname','giaivins.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0); - checkfield(md,'fieldname','giaivins.cross_section_shape','numel',[1],'values',[1,2]); + checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0); + checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices,1],'>',0); + checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2]); //be sure that if we are running a masstransport ice flow model coupled with giaivins, that thickness forcings //are not provided into the future. - if (solution=='TransientSolution' & md.trans.ismasstransport & md.trans.isgiaivins){ + if (solution=='TransientSolution' & md.trans.ismasstransport & md.trans.isgia){ //figure out if thickness is a transient forcing: if (md.geometry.thickness.length == (md.mesh.numberofvertices+1)){ Index: /issm/trunk-jpl/src/m/classes/giaivins.m =================================================================== --- /issm/trunk-jpl/src/m/classes/giaivins.m (revision 21583) +++ /issm/trunk-jpl/src/m/classes/giaivins.m (revision 21584) @@ -29,11 +29,11 @@ if ~ismember('GiaAnalysis',analyses), return; end - md = checkfield(md,'fieldname','giaivins.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0); - md = checkfield(md,'fieldname','giaivins.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0); - md = checkfield(md,'fieldname','giaivins.cross_section_shape','numel',[1],'values',[1,2]); + md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0); + md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1],'>',0); + md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2]); %be sure that if we are running a masstransport ice flow model coupled with giaivins, that thickness forcings %are not provided into the future. - if strcmp(solution,'TransientSolution') & md.transient.ismasstransport & md.transient.isgiaivins, + if strcmp(solution,'TransientSolution') & md.transient.ismasstransport & md.transient.isgia, %figure out if thickness is a transient forcing: if size(md.geometry.thickness,1)==md.mesh.numberofvertices+1, @@ -64,7 +64,7 @@ function savemodeljs(self,fid,modelname) % {{{ - writejsdouble(fid,[modelname '.giaivins.mantle_viscosity'],self.mantle_viscosity); - writejsdouble(fid,[modelname '.giaivins.lithosphere_thickness'],self.lithosphere_thickness); - writejsdouble(fid,[modelname '.giaivins.cross_section_shape'],self.cross_section_shape); + writejsdouble(fid,[modelname '.gia.mantle_viscosity'],self.mantle_viscosity); + writejsdouble(fid,[modelname '.gia.lithosphere_thickness'],self.lithosphere_thickness); + writejsdouble(fid,[modelname '.gia.cross_section_shape'],self.cross_section_shape); end % }}} Index: /issm/trunk-jpl/src/m/classes/giaivins.py =================================================================== --- /issm/trunk-jpl/src/m/classes/giaivins.py (revision 21583) +++ /issm/trunk-jpl/src/m/classes/giaivins.py (revision 21584) @@ -47,7 +47,7 @@ return md - md = checkfield(md,'fieldname','giaivins.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0) - md = checkfield(md,'fieldname','giaivins.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0) - md = checkfield(md,'fieldname','giaivins.cross_section_shape','numel',[1],'values',[1,2]) + md = checkfield(md,'fieldname','gia.mantle_viscosity','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0) + md = checkfield(md,'fieldname','gia.lithosphere_thickness','NaN',1,'Inf',1,'size',[md.mesh.numberofvertices],'>',0) + md = checkfield(md,'fieldname','gia.cross_section_shape','numel',[1],'values',[1,2]) #be sure that if we are running a masstransport ice flow model coupled with giaivins, that thickness forcings Index: /issm/trunk-jpl/src/m/classes/model.js =================================================================== --- /issm/trunk-jpl/src/m/classes/model.js (revision 21583) +++ /issm/trunk-jpl/src/m/classes/model.js (revision 21584) @@ -37,5 +37,5 @@ console.log(sprintf("//19s: //-22s -- //s","levelset" ,"[1x1 " + typeof(this.levelset) + "]","parameters for moving boundaries (level-set method)")); console.log(sprintf("//19s: //-22s -- //s","calving" ,"[1x1 " + typeof(this.calving) + "]","parameters for calving")); - console.log(sprintf("//19s: //-22s -- //s","giaivins" ,"[1x1 " + typeof(this.giaivins) + "]","parameters for giaivins solution")); + console.log(sprintf("//19s: //-22s -- //s","gia" ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution")); console.log(sprintf("//19s: //-22s -- //s","autodiff" ,"[1x1 " + typeof(this.autodiff) + "]","automatic differentiation parameters")); console.log(sprintf("//19s: //-22s -- //s","inversion" ,"[1x1 " + typeof(this.inversion) + "]","parameters for inverse methods")); @@ -78,5 +78,5 @@ this.levelset = new levelset(); this.calving = new calving(); - this.giaivins = new giaivins(); + this.gia = new giaivins(); this.autodiff = new autodiff(); this.inversion = new inversion(); @@ -473,8 +473,8 @@ // giaivins - if (!isNaN(md.giaivins.mantle_viscosity)) - md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1); - if (!isNaN(md.giaivins.lithosphere_thickness)) - md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1); + if (!isNaN(md.gia.mantle_viscosity)) + md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1); + if (!isNaN(md.gia.lithosphere_thickness)) + md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1); // elementstype @@ -607,5 +607,5 @@ this.levelset = 0; this.calving = 0; - this.giaivins = 0; + this.gia = 0; this.autodiff = 0; Index: /issm/trunk-jpl/src/m/classes/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model.m (revision 21583) +++ /issm/trunk-jpl/src/m/classes/model.m (revision 21584) @@ -40,5 +40,5 @@ levelset = 0; calving = 0; - giaivins = 0; + gia = 0; esa = 0; @@ -230,6 +230,6 @@ if ~isnan(md.initialization.watercolumn),md.initialization.watercolumn=project2d(md,md.initialization.watercolumn,1);end; %giaivins - if ~isnan(md.giaivins.mantle_viscosity), md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1); end - if ~isnan(md.giaivins.lithosphere_thickness), md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1); end + if ~isnan(md.gia.mantle_viscosity), md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1); end + if ~isnan(md.gia.lithosphere_thickness), md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1); end %elementstype @@ -1115,5 +1115,5 @@ md.levelset = levelset(); md.calving = calving(); - md.giaivins = giaivins(); + md.gia = giaivins(); md.esa = esa(); md.autodiff = autodiff(); @@ -1287,5 +1287,5 @@ disp(sprintf('%19s: %-22s -- %s','levelset' ,['[1x1 ' class(self.levelset) ']'],'parameters for moving boundaries (level-set method)')); disp(sprintf('%19s: %-22s -- %s','calving' ,['[1x1 ' class(self.calving) ']'],'parameters for calving')); - disp(sprintf('%19s: %-22s -- %s','giaivins' ,['[1x1 ' class(self.giaivins) ']'],'parameters for giaivins solution')); + disp(sprintf('%19s: %-22s -- %s','gia' ,['[1x1 ' class(self.gia) ']'],'parameters for gia solution')); disp(sprintf('%19s: %-22s -- %s','esa' ,['[1x1 ' class(self.esa) ']'],'parameters for elastic adjustment solution')); disp(sprintf('%19s: %-22s -- %s','autodiff' ,['[1x1 ' class(self.autodiff) ']'],'automatic differentiation parameters')); Index: /issm/trunk-jpl/src/m/classes/model.py =================================================================== --- /issm/trunk-jpl/src/m/classes/model.py (revision 21583) +++ /issm/trunk-jpl/src/m/classes/model.py (revision 21584) @@ -107,5 +107,5 @@ self.levelset = levelset() self.calving = calving() - self.giaivins = giaivins() + self.gia = giaivins() self.autodiff = autodiff() @@ -150,5 +150,5 @@ 'levelset',\ 'calving',\ - 'giaivins',\ + 'gia',\ 'autodiff',\ 'inversion',\ @@ -640,5 +640,5 @@ md.materials.extrude(md) md.damage.extrude(md) - md.giaivins.extrude(md) + md.gia.extrude(md) md.mask.extrude(md) md.qmu.extrude(md) @@ -697,6 +697,6 @@ #giaivins - if not np.isnan(md.giaivins.mantle_viscosity).all(): md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1) - if not np.isnan(md.giaivins.lithosphere_thickness).all(): md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1) + if not np.isnan(md.gia.mantle_viscosity).all(): md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1) + if not np.isnan(md.gia.lithosphere_thickness).all(): md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1) #elementstype Index: /issm/trunk-jpl/src/m/classes/trans.js =================================================================== --- /issm/trunk-jpl/src/m/classes/trans.js (revision 21583) +++ /issm/trunk-jpl/src/m/classes/trans.js (revision 21584) @@ -14,5 +14,5 @@ this.isthermal = 1; this.isgroundingline = 0; - this.isgiaivins = 0; + this.isgia = 0; this.isdamageevolution = 0; this.ismovingfront = 0; @@ -34,5 +34,5 @@ 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,'isgiaivins','indicates whether a postglacial rebound model 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,'ismovingfront','indicates whether a moving front capability is used in the transient'); @@ -57,5 +57,5 @@ checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]); checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','trans.isgiaivins','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]); checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]); checkfield(md,'fieldname','trans.ismovingfront','numel',[1],'values',[0, 1]); @@ -73,5 +73,5 @@ WriteData(fid,prefix,'object',this,'fieldname','isthermal','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','isgroundingline','format','Boolean'); - WriteData(fid,prefix,'object',this,'fieldname','isgiaivins','format','Boolean'); + WriteData(fid,prefix,'object',this,'fieldname','isgia','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','isdamageevolution','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','ishydrology','format','Boolean'); @@ -105,5 +105,5 @@ this.isthermal = 0; this.isgroundingline = 0; - this.isgiaivins = 0; + this.isgia = 0; this.isdamageevolution = 0; this.ismovingfront = 0; Index: /issm/trunk-jpl/src/m/classes/transient.m =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.m (revision 21583) +++ /issm/trunk-jpl/src/m/classes/transient.m (revision 21584) @@ -11,5 +11,5 @@ isthermal = 0; isgroundingline = 0; - isgiaivins = 0; + isgia = 0; isesa = 0; isdamageevolution = 0; @@ -38,5 +38,5 @@ self.isthermal = 0; self.isgroundingline = 0; - self.isgiaivins = 0; + self.isgia = 0; self.isesa = 0; self.isdamageevolution = 0; @@ -58,5 +58,5 @@ self.isthermal = 1; self.isgroundingline = 0; - self.isgiaivins = 0; + self.isgia = 0; self.isesa = 0; self.isdamageevolution = 0; @@ -87,5 +87,5 @@ md = checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0 1]); - md = checkfield(md,'fieldname','transient.isgiaivins','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]); @@ -109,5 +109,5 @@ fielddisplay(self,'isthermal','indicates whether a thermal solution is used in the transient'); fielddisplay(self,'isgroundingline','indicates whether a groundingline migration is used in the transient'); - fielddisplay(self,'isgiaivins','indicates whether a postglacial rebound model is used in the transient'); + fielddisplay(self,'isgia','indicates whether a postglacial rebound model is used in the transient'); fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient'); fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'); @@ -126,5 +126,5 @@ WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean'); - WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean'); + WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean'); @@ -151,5 +151,5 @@ writejsdouble(fid,[modelname '.trans.isthermal'],self.isthermal); writejsdouble(fid,[modelname '.trans.isgroundingline'],self.isgroundingline); - writejsdouble(fid,[modelname '.trans.isgiaivins'],self.isgiaivins); + writejsdouble(fid,[modelname '.trans.isgia'],self.isgia); writejsdouble(fid,[modelname '.trans.isesa'],self.isesa); writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution); Index: /issm/trunk-jpl/src/m/classes/transient.py =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.py (revision 21583) +++ /issm/trunk-jpl/src/m/classes/transient.py (revision 21584) @@ -17,5 +17,5 @@ self.isthermal = False self.isgroundingline = False - self.isgiaivins = False + self.isgia = False self.isesa = False self.isdamageevolution = False @@ -38,5 +38,5 @@ string="%s\n%s"%(string,fielddisplay(self,'isthermal','indicates if a thermal solution is used in the transient')) string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient')) - string="%s\n%s"%(string,fielddisplay(self,'isgiaivins','indicates if a postglacial rebound is used in the transient')) + string="%s\n%s"%(string,fielddisplay(self,'isgia','indicates if a postglacial rebound is used in the transient')) string="%s\n%s"%(string,fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient')) string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient')) @@ -65,5 +65,5 @@ self.isthermal = False self.isgroundingline = False - self.isgiaivins = False + self.isgia = False self.isesa = False self.isdamageevolution = False @@ -86,5 +86,5 @@ self.isthermal = True self.isgroundingline = False - self.isgiaivins = False + self.isgia = False self.isesa = False self.isdamageevolution = False @@ -110,5 +110,5 @@ md = checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0,1]) - md = checkfield(md,'fieldname','transient.isgiaivins','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','transient.isgia','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0,1]) @@ -131,5 +131,5 @@ WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean') - WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean') + WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean') Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js (revision 21583) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js (revision 21584) @@ -75,5 +75,5 @@ analyses=['L2ProjectionBaseAnalysis']; - }else if(solutiontype ==='GiaIvinsSolution'){ + }else if(solutiontype ==='GiaSolution'){ analyses=['GiaIvinsAnalysis']; Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 21583) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 21584) @@ -64,5 +64,5 @@ elseif strcmp(solutiontype,'BedSlopeSolution') analyses={'L2ProjectionBaseAnalysis'}; - elseif strcmp(solutiontype,'GiaIvinsSolution') + elseif strcmp(solutiontype,'GiaSolution') analyses={'GiaIvinsAnalysis'}; elseif strcmp(solutiontype,'EsaSolution') Index: /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py =================================================================== --- /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py (revision 21583) +++ /issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py (revision 21584) @@ -31,5 +31,5 @@ analyses=['L2ProjectionBaseAnalysis'] - elif solutiontype == 'GiaIvinsSolution': + elif solutiontype == 'GiaSolution': analyses=['GiaIvinsAnalysis'] Index: /issm/trunk-jpl/src/m/solve/solve.js =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.js (revision 21583) +++ /issm/trunk-jpl/src/m/solve/solve.js (revision 21584) @@ -18,5 +18,5 @@ // - 'Hydrology' or 'hy' // - 'DamageEvolution' or 'da' -// - 'GiaIvins' or 'giaivins' +// - 'Gia' or 'gia' // - 'Sealevelrise' or 'slr' // @@ -59,6 +59,6 @@ }else if((solutionstring.toLowerCase() === 'da') || (solutionstring.toLowerCase() === 'damageevolution')){ solutionstring = 'DamageEvolutionSolution'; - }else if((solutionstring.toLowerCase() === 'giaivins') || (solutionstring.toLowerCase() === 'giaivins')){ - solutionstring = 'GiaIvinsSolution'; + }else if((solutionstring.toLowerCase() === 'gia') || (solutionstring.toLowerCase() === 'gia')){ + solutionstring = 'GiaSolution'; }else if((solutionstring.toLowerCase() === 'slr') || (solutionstring.toLowerCase() === 'sealevelrise')){ solutionstring = 'SealevelriseSolution'; Index: /issm/trunk-jpl/src/m/solve/solve.m =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.m (revision 21583) +++ /issm/trunk-jpl/src/m/solve/solve.m (revision 21584) @@ -18,5 +18,5 @@ % - 'Hydrology' or 'hy' % - 'DamageEvolution' or 'da' -% - 'GiaIvins' or 'giaivins' +% - 'Gia' or 'gia' % - 'Esa' or 'esa' % - 'Sealevelrise' or 'slr' @@ -62,6 +62,6 @@ elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution') solutionstring = 'DamageEvolutionSolution'; -elseif strcmpi(solutionstring,'giaivins') || strcmpi(solutionstring,'GiaIvins') - solutionstring = 'GiaIvinsSolution'; +elseif strcmpi(solutionstring,'gia') || strcmpi(solutionstring,'Gia') + solutionstring = 'GiaSolution'; elseif strcmpi(solutionstring,'esa') || strcmpi(solutionstring,'Esa') solutionstring = 'EsaSolution'; Index: /issm/trunk-jpl/src/m/solve/solve.py =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.py (revision 21583) +++ /issm/trunk-jpl/src/m/solve/solve.py (revision 21584) @@ -28,5 +28,5 @@ - 'Hydrology' or 'hy' - 'DamageEvolution' or 'da' - - 'GiaIvins' or 'giaivins' + - 'Gia' or 'gia' - 'Sealevelrise' or 'slr' @@ -64,6 +64,6 @@ elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution': solutionstring = 'DamageEvolutionSolution'; - elif solutionstring.lower() == 'giaivins' or solutionstring.lower() == 'giaivins': - solutionstring = 'GiaIvinsSolution'; + elif solutionstring.lower() == 'gia' or solutionstring.lower() == 'gia': + solutionstring = 'GiaSolution'; elif solutionstring.lower() == 'slr' or solutionstring.lower() == 'sealevelrise': solutionstring = 'SealevelriseSolution';