Index: ../trunk-jpl/src/m/Makefile.am =================================================================== --- ../trunk-jpl/src/m/Makefile.am (revision 21529) +++ ../trunk-jpl/src/m/Makefile.am (revision 21530) @@ -94,7 +94,7 @@ ${ISSM_DIR}/src/m/classes/flowequation.js \ ${ISSM_DIR}/src/m/classes/friction.js \ ${ISSM_DIR}/src/m/classes/geometry.js \ - ${ISSM_DIR}/src/m/classes/gia.js \ + ${ISSM_DIR}/src/m/classes/giaivins.js \ ${ISSM_DIR}/src/m/classes/esa.js \ ${ISSM_DIR}/src/m/classes/groundingline.js \ ${ISSM_DIR}/src/m/classes/hydrologyshreve.js \ Index: ../trunk-jpl/src/m/solve/solve.py =================================================================== --- ../trunk-jpl/src/m/solve/solve.py (revision 21529) +++ ../trunk-jpl/src/m/solve/solve.py (revision 21530) @@ -27,7 +27,7 @@ - 'SurfaceSlope' or 'ssl' - 'Hydrology' or 'hy' - 'DamageEvolution' or 'da' - - 'Gia' or 'gia' + - 'GiaIvins' or 'giaivins' - 'Sealevelrise' or 'slr' extra options: @@ -63,8 +63,8 @@ solutionstring = 'HydrologySolution'; elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution': solutionstring = 'DamageEvolutionSolution'; - elif solutionstring.lower() == 'gia' or solutionstring.lower() == 'gia': - solutionstring = 'GiaSolution'; + elif solutionstring.lower() == 'giaivins' or solutionstring.lower() == 'giaivins': + solutionstring = 'GiaIvinsSolution'; elif solutionstring.lower() == 'slr' or solutionstring.lower() == 'sealevelrise': solutionstring = 'SealevelriseSolution'; else: Index: ../trunk-jpl/src/m/solve/solve.m =================================================================== --- ../trunk-jpl/src/m/solve/solve.m (revision 21529) +++ ../trunk-jpl/src/m/solve/solve.m (revision 21530) @@ -17,7 +17,7 @@ % - 'SurfaceSlope' or 'ssl' % - 'Hydrology' or 'hy' % - 'DamageEvolution' or 'da' -% - 'Gia' or 'gia' +% - 'GiaIvins' or 'giaivins' % - 'Esa' or 'esa' % - 'Sealevelrise' or 'slr' % @@ -61,8 +61,8 @@ solutionstring = 'HydrologySolution'; elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution') solutionstring = 'DamageEvolutionSolution'; -elseif strcmpi(solutionstring,'gia') || strcmpi(solutionstring,'Gia') - solutionstring = 'GiaSolution'; +elseif strcmpi(solutionstring,'giaivins') || strcmpi(solutionstring,'GiaIvins') + solutionstring = 'GiaIvinsSolution'; elseif strcmpi(solutionstring,'esa') || strcmpi(solutionstring,'Esa') solutionstring = 'EsaSolution'; elseif strcmpi(solutionstring,'slr') || strcmpi(solutionstring,'Sealevelrise') Index: ../trunk-jpl/src/m/solve/solve.js =================================================================== --- ../trunk-jpl/src/m/solve/solve.js (revision 21529) +++ ../trunk-jpl/src/m/solve/solve.js (revision 21530) @@ -17,7 +17,7 @@ // - 'SurfaceSlope' or 'ssl' // - 'Hydrology' or 'hy' // - 'DamageEvolution' or 'da' -// - 'Gia' or 'gia' +// - 'GiaIvins' or 'giaivins' // - 'Sealevelrise' or 'slr' // // extra options: @@ -58,8 +58,8 @@ solutionstring = 'HydrologySolution'; }else if((solutionstring.toLowerCase() === 'da') || (solutionstring.toLowerCase() === 'damageevolution')){ solutionstring = 'DamageEvolutionSolution'; - }else if((solutionstring.toLowerCase() === 'gia') || (solutionstring.toLowerCase() === 'gia')){ - solutionstring = 'GiaSolution'; + }else if((solutionstring.toLowerCase() === 'giaivins') || (solutionstring.toLowerCase() === 'giaivins')){ + solutionstring = 'GiaIvinsSolution'; }else if((solutionstring.toLowerCase() === 'slr') || (solutionstring.toLowerCase() === 'sealevelrise')){ solutionstring = 'SealevelriseSolution'; }else{ Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.js =================================================================== --- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.js (revision 21529) +++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.js (revision 21530) @@ -74,8 +74,8 @@ }else if(solutiontype ==='BedSlopeSolution'){ analyses=['L2ProjectionBaseAnalysis']; - }else if(solutiontype ==='GiaSolution'){ - analyses=['GiaAnalysis']; + }else if(solutiontype ==='GiaIvinsSolution'){ + analyses=['GiaIvinsAnalysis']; }else if(solutiontype ==='TransientSolution'){ analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis','HydrologySommersAnalysis']; Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m =================================================================== --- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 21529) +++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.m (revision 21530) @@ -63,8 +63,8 @@ analyses={'L2ProjectionBaseAnalysis'}; elseif strcmp(solutiontype,'BedSlopeSolution') analyses={'L2ProjectionBaseAnalysis'}; - elseif strcmp(solutiontype,'GiaSolution') - analyses={'GiaAnalysis'}; + elseif strcmp(solutiontype,'GiaIvinsSolution') + analyses={'GiaIvinsAnalysis'}; elseif strcmp(solutiontype,'EsaSolution') analyses={'EsaAnalysis'}; elseif strcmp(solutiontype,'TransientSolution') Index: ../trunk-jpl/src/m/consistency/ismodelselfconsistent.py =================================================================== --- ../trunk-jpl/src/m/consistency/ismodelselfconsistent.py (revision 21529) +++ ../trunk-jpl/src/m/consistency/ismodelselfconsistent.py (revision 21530) @@ -30,8 +30,8 @@ elif solutiontype == 'BedSlopeSolution': analyses=['L2ProjectionBaseAnalysis'] - elif solutiontype == 'GiaSolution': - analyses=['GiaAnalysis'] + elif solutiontype == 'GiaIvinsSolution': + analyses=['GiaIvinsAnalysis'] elif solutiontype == 'TransientSolution': analyses=['StressbalanceAnalysis','StressbalanceVerticalAnalysis','StressbalanceSIAAnalysis','L2ProjectionBaseAnalysis','ThermalAnalysis','MeltingAnalysis','EnthalpyAnalysis','MasstransportAnalysis'] Index: ../trunk-jpl/src/m/classes/geometry.py =================================================================== --- ../trunk-jpl/src/m/classes/geometry.py (revision 21529) +++ ../trunk-jpl/src/m/classes/geometry.py (revision 21530) @@ -44,7 +44,7 @@ #}}} def checkconsistency(self,md,solution,analyses): # {{{ - if (solution=='TransientSolution' and md.transient.isgia) or (solution=='GiaSolution'): + if (solution=='TransientSolution' and md.transient.isgiaivins) or (solution=='GiaIvinsSolution'): md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'>=',0,'timeseries',1) else: md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices]) Index: ../trunk-jpl/src/m/classes/model.m =================================================================== --- ../trunk-jpl/src/m/classes/model.m (revision 21529) +++ ../trunk-jpl/src/m/classes/model.m (revision 21530) @@ -39,7 +39,7 @@ transient = 0; levelset = 0; calving = 0; - gia = 0; + giaivins = 0; esa = 0; autodiff = 0; @@ -224,9 +224,9 @@ if ~isnan(md.initialization.epl_thickness),md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1);end; if ~isnan(md.initialization.waterfraction),md.initialization.waterfraction=project2d(md,md.initialization.waterfraction,1);end; if ~isnan(md.initialization.watercolumn),md.initialization.watercolumn=project2d(md,md.initialization.watercolumn,1);end; - %gia - 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 + %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 %elementstype if ~isnan(md.flowequation.element_equation) @@ -1111,7 +1111,7 @@ md.transient = transient(); md.levelset = levelset(); md.calving = calving(); - md.gia = gia(); + md.giaivins = giaivins(); md.esa = esa(); md.autodiff = autodiff(); md.inversion = inversion(); @@ -1283,7 +1283,7 @@ disp(sprintf('%19s: %-22s -- %s','transient' ,['[1x1 ' class(self.transient) ']'],'parameters for transient solution')); 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','gia' ,['[1x1 ' class(self.gia) ']'],'parameters for gia solution')); + disp(sprintf('%19s: %-22s -- %s','giaivins' ,['[1x1 ' class(self.giaivins) ']'],'parameters for giaivins 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')); disp(sprintf('%19s: %-22s -- %s','inversion' ,['[1x1 ' class(self.inversion) ']'],'parameters for inverse methods')); Index: ../trunk-jpl/src/m/classes/model.js =================================================================== --- ../trunk-jpl/src/m/classes/model.js (revision 21529) +++ ../trunk-jpl/src/m/classes/model.js (revision 21530) @@ -36,7 +36,7 @@ console.log(sprintf("//19s: //-22s -- //s","trans" ,"[1x1 " + typeof(this.trans) + "]","parameters for trans solution")); 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","gia" ,"[1x1 " + typeof(this.gia) + "]","parameters for gia solution")); + console.log(sprintf("//19s: //-22s -- //s","giaivins" ,"[1x1 " + typeof(this.giaivins) + "]","parameters for giaivins 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")); console.log(sprintf("//19s: //-22s -- //s","qmu" ,"[1x1 " + typeof(this.qmu) + "]","dakota properties")); @@ -77,7 +77,7 @@ this.trans = new trans(); this.levelset = new levelset(); this.calving = new calving(); - this.gia = new gia(); + this.giaivins = new giaivins(); this.autodiff = new autodiff(); this.inversion = new inversion(); this.qmu = new qmu(); @@ -471,11 +471,11 @@ if (!isNaN(md.initialization.epl_thickness)) md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1); - // gia - 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); + // 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); // elementstype if (!isNaN(md.flowequation.element_equation)) { @@ -606,7 +606,7 @@ this.trans = 0; this.levelset = 0; this.calving = 0; - this.gia = 0; + this.giaivins = 0; this.autodiff = 0; this.inversion = 0; Index: ../trunk-jpl/src/m/classes/geometry.js =================================================================== --- ../trunk-jpl/src/m/classes/geometry.js (revision 21529) +++ ../trunk-jpl/src/m/classes/geometry.js (revision 21530) @@ -28,7 +28,7 @@ } //}}} this.checkconsistency = function(md,solution,analyses) { //{{{ - if ((solution=='TransientSolution' & md.trans.isgia) | (solution=='GiaSolution')){ + if ((solution=='TransientSolution' & md.trans.isgiaivins) | (solution=='GiaIvinsSolution')){ checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0); } else{ Index: ../trunk-jpl/src/m/classes/matenhancedice.m =================================================================== --- ../trunk-jpl/src/m/classes/matenhancedice.m (revision 21529) +++ ../trunk-jpl/src/m/classes/matenhancedice.m (revision 21530) @@ -22,7 +22,7 @@ rheology_n = NaN; rheology_law = ''; - %gia: + %giaivins: lithosphere_shear_modulus = 0.; lithosphere_density = 0.; mantle_shear_modulus = 0.; Index: ../trunk-jpl/src/m/classes/matice.m =================================================================== --- ../trunk-jpl/src/m/classes/matice.m (revision 21529) +++ ../trunk-jpl/src/m/classes/matice.m (revision 21530) @@ -21,7 +21,7 @@ rheology_n = NaN; rheology_law = ''; - %gia: + %giaivins: lithosphere_shear_modulus = 0.; lithosphere_density = 0.; mantle_shear_modulus = 0.; Index: ../trunk-jpl/src/m/classes/matestar.m =================================================================== --- ../trunk-jpl/src/m/classes/matestar.m (revision 21529) +++ ../trunk-jpl/src/m/classes/matestar.m (revision 21530) @@ -22,7 +22,7 @@ rheology_Es = NaN; rheology_law = ''; - %gia: + %giaivins: lithosphere_shear_modulus = 0.; lithosphere_density = 0.; mantle_shear_modulus = 0.; Index: ../trunk-jpl/src/m/classes/matice.py =================================================================== --- ../trunk-jpl/src/m/classes/matice.py (revision 21529) +++ ../trunk-jpl/src/m/classes/matice.py (revision 21530) @@ -28,7 +28,7 @@ self.rheology_n = float('NaN') self.rheology_law = '' - #gia: + #giaivins: self.lithosphere_shear_modulus = 0. self.lithosphere_density = 0. self.mantle_shear_modulus = 0. Index: ../trunk-jpl/src/m/classes/matdamageice.py =================================================================== --- ../trunk-jpl/src/m/classes/matdamageice.py (revision 21529) +++ ../trunk-jpl/src/m/classes/matdamageice.py (revision 21530) @@ -28,7 +28,7 @@ self.rheology_n = float('NaN') self.rheology_law = '' - #gia: + #giaivins: self.lithosphere_shear_modulus = 0. self.lithosphere_density = 0. self.mantle_shear_modulus = 0. Index: ../trunk-jpl/src/m/classes/matdamageice.m =================================================================== --- ../trunk-jpl/src/m/classes/matdamageice.m (revision 21529) +++ ../trunk-jpl/src/m/classes/matdamageice.m (revision 21530) @@ -21,7 +21,7 @@ rheology_n = NaN; rheology_law = ''; - %gia: + %giaivins: lithosphere_shear_modulus = 0.; lithosphere_density = 0.; mantle_shear_modulus = 0.; Index: ../trunk-jpl/src/m/classes/transient.py =================================================================== --- ../trunk-jpl/src/m/classes/transient.py (revision 21529) +++ ../trunk-jpl/src/m/classes/transient.py (revision 21530) @@ -16,7 +16,7 @@ self.isstressbalance = False self.isthermal = False self.isgroundingline = False - self.isgia = False + self.isgiaivins = False self.isesa = False self.isdamageevolution = False self.ismovingfront = False @@ -36,7 +36,7 @@ string="%s\n%s"%(string,fielddisplay(self,'isstressbalance','indicates if a stressbalance solution is used in the transient')) 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,'isgia','indicates if a postglacial rebound 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,'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')) string="%s\n%s"%(string,fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient')) @@ -62,7 +62,7 @@ self.isstressbalance = False self.isthermal = False self.isgroundingline = False - self.isgia = False + self.isgiaivins = False self.isesa = False self.isdamageevolution = False self.ismovingfront = False @@ -82,7 +82,7 @@ self.isstressbalance = True self.isthermal = True self.isgroundingline = False - self.isgia = False + self.isgiaivins = False self.isesa = False self.isdamageevolution = False self.ismovingfront = False @@ -105,7 +105,7 @@ md = checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0,1]) 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.isgia','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','transient.isgiaivins','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]) md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1]) @@ -122,7 +122,7 @@ WriteData(fid,prefix,'object',self,'fieldname','isstressbalance','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean') - WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean') + WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean') WriteData(fid,prefix,'object',self,'fieldname','ishydrology','format','Boolean') Index: ../trunk-jpl/src/m/classes/matice.js =================================================================== --- ../trunk-jpl/src/m/classes/matice.js (revision 21529) +++ ../trunk-jpl/src/m/classes/matice.js (revision 21530) @@ -156,7 +156,7 @@ this.rheology_n = NaN; this.rheology_law = ''; - //gia: + //giaivins: this.lithosphere_shear_modulus = 0.; this.lithosphere_density = 0.; this.mantle_shear_modulus = 0.; Index: ../trunk-jpl/src/m/classes/geometry.m =================================================================== --- ../trunk-jpl/src/m/classes/geometry.m (revision 21529) +++ ../trunk-jpl/src/m/classes/geometry.m (revision 21530) @@ -52,7 +52,7 @@ end % }}} function md = checkconsistency(self,md,solution,analyses) % {{{ - if (strcmp(solution,'TransientSolution') & md.transient.isgia) | strcmp(solution,'GiaSolution'), + if (strcmp(solution,'TransientSolution') & md.transient.isgiaivins) | strcmp(solution,'GiaIvinsSolution'), md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0); else md = checkfield(md,'fieldname','geometry.surface' ,'NaN',1,'Inf',1,'size',[md.mesh.numberofvertices 1]); Index: ../trunk-jpl/src/m/classes/slr.m =================================================================== --- ../trunk-jpl/src/m/classes/slr.m (revision 21529) +++ ../trunk-jpl/src/m/classes/slr.m (revision 21530) @@ -140,6 +140,7 @@ end % }}} function marshall(self,prefix,md,fid) % {{{ WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2); + %WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofelements+1); WriteData(fid,prefix,'object',self,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double'); WriteData(fid,prefix,'object',self,'fieldname','abstol','format','Double'); Index: ../trunk-jpl/src/m/classes/trans.js =================================================================== --- ../trunk-jpl/src/m/classes/trans.js (revision 21529) +++ ../trunk-jpl/src/m/classes/trans.js (revision 21530) @@ -13,7 +13,7 @@ this.isstressbalance = 1; this.isthermal = 1; this.isgroundingline = 0; - this.isgia = 0; + this.isgiaivins = 0; this.isdamageevolution = 0; this.ismovingfront = 0; this.ishydrology = 0; @@ -33,7 +33,7 @@ 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,'isgiaivins','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'); fielddisplay(this,'ishydrology','indicates whether an hydrology model is used'); @@ -56,7 +56,7 @@ checkfield(md,'fieldname','trans.isstressbalance','numel',[1],'values',[0 ,1]); checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]); checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]); - checkfield(md,'fieldname','trans.isgia','numel',[1],'values',[0, 1]); + checkfield(md,'fieldname','trans.isgiaivins','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]); checkfield(md,'fieldname','trans.ishydrology','numel',[1],'values',[0 ,1]); @@ -72,7 +72,7 @@ WriteData(fid,prefix,'object',this,'fieldname','isstressbalance','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','isthermal','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','isgroundingline','format','Boolean'); - WriteData(fid,prefix,'object',this,'fieldname','isgia','format','Boolean'); + WriteData(fid,prefix,'object',this,'fieldname','isgiaivins','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','isdamageevolution','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','ishydrology','format','Boolean'); WriteData(fid,prefix,'object',this,'fieldname','ismovingfront','format','Boolean'); @@ -104,7 +104,7 @@ this.isstressbalance = 0; this.isthermal = 0; this.isgroundingline = 0; - this.isgia = 0; + this.isgiaivins = 0; this.isdamageevolution = 0; this.ismovingfront = 0; this.ishydrology = 0; Index: ../trunk-jpl/src/m/classes/model.py =================================================================== --- ../trunk-jpl/src/m/classes/model.py (revision 21529) +++ ../trunk-jpl/src/m/classes/model.py (revision 21530) @@ -44,7 +44,7 @@ from thermal import thermal from steadystate import steadystate from transient import transient -from gia import gia +from giaivins import giaivins from autodiff import autodiff from inversion import inversion from outputdefinition import outputdefinition @@ -106,7 +106,7 @@ self.transient = transient() self.levelset = levelset() self.calving = calving() - self.gia = gia() + self.giaivins = giaivins() self.autodiff = autodiff() self.inversion = inversion() @@ -149,7 +149,7 @@ 'transient',\ 'levelset',\ 'calving',\ - 'gia',\ + 'giaivins',\ 'autodiff',\ 'inversion',\ 'qmu',\ @@ -639,7 +639,7 @@ md.materials.extrude(md) md.damage.extrude(md) - md.gia.extrude(md) + md.giaivins.extrude(md) md.mask.extrude(md) md.qmu.extrude(md) md.basalforcings.extrude(md) @@ -695,9 +695,9 @@ if not np.isnan(md.initialization.epl_head).all(): md.initialization.epl_head=project2d(md,md.initialization.epl_head,1) if not np.isnan(md.initialization.epl_thickness).all(): md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1) - #gia - 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) + #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) #elementstype if not np.isnan(md.flowequation.element_equation).all(): Index: ../trunk-jpl/src/m/classes/transient.m =================================================================== --- ../trunk-jpl/src/m/classes/transient.m (revision 21529) +++ ../trunk-jpl/src/m/classes/transient.m (revision 21530) @@ -10,7 +10,7 @@ isstressbalance = 0; isthermal = 0; isgroundingline = 0; - isgia = 0; + isgiaivins = 0; isesa = 0; isdamageevolution = 0; ismovingfront = 0; @@ -36,7 +36,7 @@ self.isstressbalance = 0; self.isthermal = 0; self.isgroundingline = 0; - self.isgia = 0; + self.isgiaivins = 0; self.isesa = 0; self.isdamageevolution = 0; self.ismovingfront =0; @@ -55,7 +55,7 @@ self.isstressbalance = 1; self.isthermal = 1; self.isgroundingline = 0; - self.isgia = 0; + self.isgiaivins = 0; self.isesa = 0; self.isdamageevolution = 0; self.ismovingfront = 0; @@ -83,7 +83,7 @@ md = checkfield(md,'fieldname','transient.isstressbalance','numel',[1],'values',[0 1]); 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.isgia','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','transient.isgiaivins','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]); md = checkfield(md,'fieldname','transient.ismovingfront','numel',[1],'values',[0 1]); @@ -101,7 +101,7 @@ fielddisplay(self,'isstressbalance','indicates whether a stressbalance solution is used in the transient'); 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,'isgia','indicates whether a postglacial rebound model is used in the transient'); + fielddisplay(self,'isgiaivins','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'); fielddisplay(self,'ismovingfront','indicates whether a moving front capability is used in the transient'); @@ -117,7 +117,7 @@ WriteData(fid,prefix,'object',self,'fieldname','isstressbalance','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean'); - WriteData(fid,prefix,'object',self,'fieldname','isgia','format','Boolean'); + WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean'); WriteData(fid,prefix,'object',self,'fieldname','ishydrology','format','Boolean'); @@ -141,7 +141,7 @@ writejsdouble(fid,[modelname '.trans.isstressbalance'],self.isstressbalance); writejsdouble(fid,[modelname '.trans.isthermal'],self.isthermal); writejsdouble(fid,[modelname '.trans.isgroundingline'],self.isgroundingline); - writejsdouble(fid,[modelname '.trans.isgia'],self.isgia); + writejsdouble(fid,[modelname '.trans.isgiaivins'],self.isgiaivins); writejsdouble(fid,[modelname '.trans.isesa'],self.isesa); writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution); writejsdouble(fid,[modelname '.trans.ismovingfront'],self.ismovingfront); Index: ../trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py =================================================================== --- ../trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py (revision 21529) +++ ../trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py (revision 21530) @@ -69,7 +69,7 @@ 'steadystate':'steadystate',\ 'transient':'transient',\ 'calving':'calving',\ - 'gia':'gia',\ + 'giaivins':'giaivins',\ 'autodiff':'autodiff',\ 'inversion':'inversion',\ 'qmu':'qmu',\