![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 21530
- Timestamp:
- 02/08/17 17:57:18 (8 years ago)
- Location:
- issm/trunk-jpl/src/m
- Files:
-
- 25 edited
-
Makefile.am (modified) (1 diff)
-
classes/geometry.js (modified) (1 diff)
-
classes/geometry.m (modified) (1 diff)
-
classes/geometry.py (modified) (1 diff)
-
classes/matdamageice.m (modified) (1 diff)
-
classes/matdamageice.py (modified) (1 diff)
-
classes/matenhancedice.m (modified) (1 diff)
-
classes/matestar.m (modified) (1 diff)
-
classes/matice.js (modified) (1 diff)
-
classes/matice.m (modified) (1 diff)
-
classes/matice.py (modified) (1 diff)
-
classes/model.js (modified) (4 diffs)
-
classes/model.m (modified) (4 diffs)
-
classes/model.py (modified) (5 diffs)
-
classes/slr.m (modified) (1 diff)
-
classes/trans.js (modified) (5 diffs)
-
classes/transient.m (modified) (7 diffs)
-
classes/transient.py (modified) (6 diffs)
-
consistency/ismodelselfconsistent.js (modified) (1 diff)
-
consistency/ismodelselfconsistent.m (modified) (1 diff)
-
consistency/ismodelselfconsistent.py (modified) (1 diff)
-
contrib/defleurian/netCDF/ClassTry.py (modified) (1 diff)
-
solve/solve.js (modified) (2 diffs)
-
solve/solve.m (modified) (2 diffs)
-
solve/solve.py (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/m/Makefile.am
r21260 r21530 95 95 ${ISSM_DIR}/src/m/classes/friction.js \ 96 96 ${ISSM_DIR}/src/m/classes/geometry.js \ 97 ${ISSM_DIR}/src/m/classes/gia .js \97 ${ISSM_DIR}/src/m/classes/giaivins.js \ 98 98 ${ISSM_DIR}/src/m/classes/esa.js \ 99 99 ${ISSM_DIR}/src/m/classes/groundingline.js \ -
issm/trunk-jpl/src/m/classes/geometry.js
r21065 r21530 29 29 this.checkconsistency = function(md,solution,analyses) { //{{{ 30 30 31 if ((solution=='TransientSolution' & md.trans.isgia ) | (solution=='GiaSolution')){31 if ((solution=='TransientSolution' & md.trans.isgiaivins) | (solution=='GiaIvinsSolution')){ 32 32 checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0); 33 33 } -
issm/trunk-jpl/src/m/classes/geometry.m
r21049 r21530 53 53 function md = checkconsistency(self,md,solution,analyses) % {{{ 54 54 55 if (strcmp(solution,'TransientSolution') & md.transient.isgia ) | strcmp(solution,'GiaSolution'),55 if (strcmp(solution,'TransientSolution') & md.transient.isgiaivins) | strcmp(solution,'GiaIvinsSolution'), 56 56 md = checkfield(md,'fieldname','geometry.thickness','timeseries',1,'NaN',1,'Inf',1,'>=',0); 57 57 else -
issm/trunk-jpl/src/m/classes/geometry.py
r21049 r21530 45 45 def checkconsistency(self,md,solution,analyses): # {{{ 46 46 47 if (solution=='TransientSolution' and md.transient.isgia ) or (solution=='GiaSolution'):47 if (solution=='TransientSolution' and md.transient.isgiaivins) or (solution=='GiaIvinsSolution'): 48 48 md = checkfield(md,'fieldname','geometry.thickness','NaN',1,'Inf',1,'>=',0,'timeseries',1) 49 49 else: -
issm/trunk-jpl/src/m/classes/matdamageice.m
r21378 r21530 22 22 rheology_law = ''; 23 23 24 %gia :24 %giaivins: 25 25 lithosphere_shear_modulus = 0.; 26 26 lithosphere_density = 0.; -
issm/trunk-jpl/src/m/classes/matdamageice.py
r21378 r21530 29 29 self.rheology_law = '' 30 30 31 #gia :31 #giaivins: 32 32 self.lithosphere_shear_modulus = 0. 33 33 self.lithosphere_density = 0. -
issm/trunk-jpl/src/m/classes/matenhancedice.m
r21380 r21530 23 23 rheology_law = ''; 24 24 25 %gia :25 %giaivins: 26 26 lithosphere_shear_modulus = 0.; 27 27 lithosphere_density = 0.; -
issm/trunk-jpl/src/m/classes/matestar.m
r21381 r21530 23 23 rheology_law = ''; 24 24 25 %gia :25 %giaivins: 26 26 lithosphere_shear_modulus = 0.; 27 27 lithosphere_density = 0.; -
issm/trunk-jpl/src/m/classes/matice.js
r21378 r21530 157 157 this.rheology_law = ''; 158 158 159 //gia :159 //giaivins: 160 160 this.lithosphere_shear_modulus = 0.; 161 161 this.lithosphere_density = 0.; -
issm/trunk-jpl/src/m/classes/matice.m
r21377 r21530 22 22 rheology_law = ''; 23 23 24 %gia :24 %giaivins: 25 25 lithosphere_shear_modulus = 0.; 26 26 lithosphere_density = 0.; -
issm/trunk-jpl/src/m/classes/matice.py
r21378 r21530 29 29 self.rheology_law = '' 30 30 31 #gia :31 #giaivins: 32 32 self.lithosphere_shear_modulus = 0. 33 33 self.lithosphere_density = 0. -
issm/trunk-jpl/src/m/classes/model.js
r21097 r21530 37 37 console.log(sprintf("//19s: //-22s -- //s","levelset" ,"[1x1 " + typeof(this.levelset) + "]","parameters for moving boundaries (level-set method)")); 38 38 console.log(sprintf("//19s: //-22s -- //s","calving" ,"[1x1 " + typeof(this.calving) + "]","parameters for calving")); 39 console.log(sprintf("//19s: //-22s -- //s","gia " ,"[1x1 " + typeof(this.gia) + "]","parameters for giasolution"));39 console.log(sprintf("//19s: //-22s -- //s","giaivins" ,"[1x1 " + typeof(this.giaivins) + "]","parameters for giaivins solution")); 40 40 console.log(sprintf("//19s: //-22s -- //s","autodiff" ,"[1x1 " + typeof(this.autodiff) + "]","automatic differentiation parameters")); 41 41 console.log(sprintf("//19s: //-22s -- //s","inversion" ,"[1x1 " + typeof(this.inversion) + "]","parameters for inverse methods")); … … 78 78 this.levelset = new levelset(); 79 79 this.calving = new calving(); 80 this.gia = new gia();80 this.giaivins = new giaivins(); 81 81 this.autodiff = new autodiff(); 82 82 this.inversion = new inversion(); … … 472 472 md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1); 473 473 474 // gia 475 if (!isNaN(md.gia .mantle_viscosity))476 md.gia .mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1);477 if (!isNaN(md.gia .lithosphere_thickness))478 md.gia .lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1);474 // giaivins 475 if (!isNaN(md.giaivins.mantle_viscosity)) 476 md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1); 477 if (!isNaN(md.giaivins.lithosphere_thickness)) 478 md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1); 479 479 480 480 // elementstype … … 607 607 this.levelset = 0; 608 608 this.calving = 0; 609 this.gia = 0;609 this.giaivins = 0; 610 610 611 611 this.autodiff = 0; -
issm/trunk-jpl/src/m/classes/model.m
r21499 r21530 40 40 levelset = 0; 41 41 calving = 0; 42 gia = 0;42 giaivins = 0; 43 43 esa = 0; 44 44 … … 225 225 if ~isnan(md.initialization.waterfraction),md.initialization.waterfraction=project2d(md,md.initialization.waterfraction,1);end; 226 226 if ~isnan(md.initialization.watercolumn),md.initialization.watercolumn=project2d(md,md.initialization.watercolumn,1);end; 227 %gia 228 if ~isnan(md.gia .mantle_viscosity), md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1); end229 if ~isnan(md.gia .lithosphere_thickness), md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1); end227 %giaivins 228 if ~isnan(md.giaivins.mantle_viscosity), md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1); end 229 if ~isnan(md.giaivins.lithosphere_thickness), md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1); end 230 230 231 231 %elementstype … … 1112 1112 md.levelset = levelset(); 1113 1113 md.calving = calving(); 1114 md.gia = gia();1114 md.giaivins = giaivins(); 1115 1115 md.esa = esa(); 1116 1116 md.autodiff = autodiff(); … … 1284 1284 disp(sprintf('%19s: %-22s -- %s','levelset' ,['[1x1 ' class(self.levelset) ']'],'parameters for moving boundaries (level-set method)')); 1285 1285 disp(sprintf('%19s: %-22s -- %s','calving' ,['[1x1 ' class(self.calving) ']'],'parameters for calving')); 1286 disp(sprintf('%19s: %-22s -- %s','gia ' ,['[1x1 ' class(self.gia) ']'],'parameters for giasolution'));1286 disp(sprintf('%19s: %-22s -- %s','giaivins' ,['[1x1 ' class(self.giaivins) ']'],'parameters for giaivins solution')); 1287 1287 disp(sprintf('%19s: %-22s -- %s','esa' ,['[1x1 ' class(self.esa) ']'],'parameters for elastic adjustment solution')); 1288 1288 disp(sprintf('%19s: %-22s -- %s','autodiff' ,['[1x1 ' class(self.autodiff) ']'],'automatic differentiation parameters')); -
issm/trunk-jpl/src/m/classes/model.py
r21499 r21530 45 45 from steadystate import steadystate 46 46 from transient import transient 47 from gia import gia47 from giaivins import giaivins 48 48 from autodiff import autodiff 49 49 from inversion import inversion … … 107 107 self.levelset = levelset() 108 108 self.calving = calving() 109 self.gia = gia()109 self.giaivins = giaivins() 110 110 111 111 self.autodiff = autodiff() … … 150 150 'levelset',\ 151 151 'calving',\ 152 'gia ',\152 'giaivins',\ 153 153 'autodiff',\ 154 154 'inversion',\ … … 640 640 md.materials.extrude(md) 641 641 md.damage.extrude(md) 642 md.gia .extrude(md)642 md.giaivins.extrude(md) 643 643 md.mask.extrude(md) 644 644 md.qmu.extrude(md) … … 696 696 if not np.isnan(md.initialization.epl_thickness).all(): md.initialization.epl_thickness=project2d(md,md.initialization.epl_thickness,1) 697 697 698 #gia 699 if not np.isnan(md.gia .mantle_viscosity).all(): md.gia.mantle_viscosity=project2d(md,md.gia.mantle_viscosity,1)700 if not np.isnan(md.gia .lithosphere_thickness).all(): md.gia.lithosphere_thickness=project2d(md,md.gia.lithosphere_thickness,1)698 #giaivins 699 if not np.isnan(md.giaivins.mantle_viscosity).all(): md.giaivins.mantle_viscosity=project2d(md,md.giaivins.mantle_viscosity,1) 700 if not np.isnan(md.giaivins.lithosphere_thickness).all(): md.giaivins.lithosphere_thickness=project2d(md,md.giaivins.lithosphere_thickness,1) 701 701 702 702 #elementstype -
issm/trunk-jpl/src/m/classes/slr.m
r21345 r21530 141 141 function marshall(self,prefix,md,fid) % {{{ 142 142 WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',2); 143 %WriteData(fid,prefix,'object',self,'fieldname','deltathickness','format','DoubleMat','mattype',1,'timeserieslength',md.mesh.numberofelements+1); 143 144 WriteData(fid,prefix,'object',self,'fieldname','sealevel','mattype',1,'format','DoubleMat','timeserieslength',md.mesh.numberofvertices+1,'yts',md.constants.yts); 144 145 WriteData(fid,prefix,'object',self,'fieldname','reltol','format','Double'); -
issm/trunk-jpl/src/m/classes/trans.js
r21065 r21530 14 14 this.isthermal = 1; 15 15 this.isgroundingline = 0; 16 this.isgia = 0;16 this.isgiaivins = 0; 17 17 this.isdamageevolution = 0; 18 18 this.ismovingfront = 0; … … 34 34 fielddisplay(this,'isthermal','indicates whether a thermal solution is used in the transient'); 35 35 fielddisplay(this,'isgroundingline','indicates whether a groundingline migration is used in the transient'); 36 fielddisplay(this,'isgia ','indicates whether a postglacial rebound model is used in the transient');36 fielddisplay(this,'isgiaivins','indicates whether a postglacial rebound model is used in the transient'); 37 37 fielddisplay(this,'isdamageevolution','indicates whether damage evolution is used in the transient'); 38 38 fielddisplay(this,'ismovingfront','indicates whether a moving front capability is used in the transient'); … … 57 57 checkfield(md,'fieldname','trans.isthermal','numel',[1],'values',[0 ,1]); 58 58 checkfield(md,'fieldname','trans.isgroundingline','numel',[1],'values',[0, 1]); 59 checkfield(md,'fieldname','trans.isgia ','numel',[1],'values',[0, 1]);59 checkfield(md,'fieldname','trans.isgiaivins','numel',[1],'values',[0, 1]); 60 60 checkfield(md,'fieldname','trans.isdamageevolution','numel',[1],'values',[0, 1]); 61 61 checkfield(md,'fieldname','trans.ismovingfront','numel',[1],'values',[0, 1]); … … 73 73 WriteData(fid,prefix,'object',this,'fieldname','isthermal','format','Boolean'); 74 74 WriteData(fid,prefix,'object',this,'fieldname','isgroundingline','format','Boolean'); 75 WriteData(fid,prefix,'object',this,'fieldname','isgia ','format','Boolean');75 WriteData(fid,prefix,'object',this,'fieldname','isgiaivins','format','Boolean'); 76 76 WriteData(fid,prefix,'object',this,'fieldname','isdamageevolution','format','Boolean'); 77 77 WriteData(fid,prefix,'object',this,'fieldname','ishydrology','format','Boolean'); … … 105 105 this.isthermal = 0; 106 106 this.isgroundingline = 0; 107 this.isgia = 0;107 this.isgiaivins = 0; 108 108 this.isdamageevolution = 0; 109 109 this.ismovingfront = 0; -
issm/trunk-jpl/src/m/classes/transient.m
r21260 r21530 11 11 isthermal = 0; 12 12 isgroundingline = 0; 13 isgia = 0;13 isgiaivins = 0; 14 14 isesa = 0; 15 15 isdamageevolution = 0; … … 37 37 self.isthermal = 0; 38 38 self.isgroundingline = 0; 39 self.isgia = 0;39 self.isgiaivins = 0; 40 40 self.isesa = 0; 41 41 self.isdamageevolution = 0; … … 56 56 self.isthermal = 1; 57 57 self.isgroundingline = 0; 58 self.isgia = 0;58 self.isgiaivins = 0; 59 59 self.isesa = 0; 60 60 self.isdamageevolution = 0; … … 84 84 md = checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0 1]); 85 85 md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0 1]); 86 md = checkfield(md,'fieldname','transient.isgia ','numel',[1],'values',[0 1]);86 md = checkfield(md,'fieldname','transient.isgiaivins','numel',[1],'values',[0 1]); 87 87 md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0 1]); 88 88 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]); … … 102 102 fielddisplay(self,'isthermal','indicates whether a thermal solution is used in the transient'); 103 103 fielddisplay(self,'isgroundingline','indicates whether a groundingline migration is used in the transient'); 104 fielddisplay(self,'isgia ','indicates whether a postglacial rebound model is used in the transient');104 fielddisplay(self,'isgiaivins','indicates whether a postglacial rebound model is used in the transient'); 105 105 fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient'); 106 106 fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient'); … … 118 118 WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean'); 119 119 WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean'); 120 WriteData(fid,prefix,'object',self,'fieldname','isgia ','format','Boolean');120 WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean'); 121 121 WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean'); 122 122 WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean'); … … 142 142 writejsdouble(fid,[modelname '.trans.isthermal'],self.isthermal); 143 143 writejsdouble(fid,[modelname '.trans.isgroundingline'],self.isgroundingline); 144 writejsdouble(fid,[modelname '.trans.isgia '],self.isgia);144 writejsdouble(fid,[modelname '.trans.isgiaivins'],self.isgiaivins); 145 145 writejsdouble(fid,[modelname '.trans.isesa'],self.isesa); 146 146 writejsdouble(fid,[modelname '.trans.isdamageevolution'],self.isdamageevolution); -
issm/trunk-jpl/src/m/classes/transient.py
r21263 r21530 17 17 self.isthermal = False 18 18 self.isgroundingline = False 19 self.isgia = False19 self.isgiaivins = False 20 20 self.isesa = False 21 21 self.isdamageevolution = False … … 37 37 string="%s\n%s"%(string,fielddisplay(self,'isthermal','indicates if a thermal solution is used in the transient')) 38 38 string="%s\n%s"%(string,fielddisplay(self,'isgroundingline','indicates if a groundingline migration is used in the transient')) 39 string="%s\n%s"%(string,fielddisplay(self,'isgia ','indicates if a postglacial rebound is used in the transient'))39 string="%s\n%s"%(string,fielddisplay(self,'isgiaivins','indicates if a postglacial rebound is used in the transient')) 40 40 string="%s\n%s"%(string,fielddisplay(self,'isesa','indicates whether an elastic adjustment model is used in the transient')) 41 41 string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient')) … … 63 63 self.isthermal = False 64 64 self.isgroundingline = False 65 self.isgia = False65 self.isgiaivins = False 66 66 self.isesa = False 67 67 self.isdamageevolution = False … … 83 83 self.isthermal = True 84 84 self.isgroundingline = False 85 self.isgia = False85 self.isgiaivins = False 86 86 self.isesa = False 87 87 self.isdamageevolution = False … … 106 106 md = checkfield(md,'fieldname','transient.isthermal','numel',[1],'values',[0,1]) 107 107 md = checkfield(md,'fieldname','transient.isgroundingline','numel',[1],'values',[0,1]) 108 md = checkfield(md,'fieldname','transient.isgia ','numel',[1],'values',[0,1])108 md = checkfield(md,'fieldname','transient.isgiaivins','numel',[1],'values',[0,1]) 109 109 md = checkfield(md,'fieldname','transient.isesa','numel',[1],'values',[0,1]) 110 110 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0,1]) … … 123 123 WriteData(fid,prefix,'object',self,'fieldname','isthermal','format','Boolean') 124 124 WriteData(fid,prefix,'object',self,'fieldname','isgroundingline','format','Boolean') 125 WriteData(fid,prefix,'object',self,'fieldname','isgia ','format','Boolean')125 WriteData(fid,prefix,'object',self,'fieldname','isgiaivins','format','Boolean') 126 126 WriteData(fid,prefix,'object',self,'fieldname','isesa','format','Boolean') 127 127 WriteData(fid,prefix,'object',self,'fieldname','isdamageevolution','format','Boolean') -
issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.js
r21142 r21530 75 75 analyses=['L2ProjectionBaseAnalysis']; 76 76 77 }else if(solutiontype ==='Gia Solution'){78 analyses=['Gia Analysis'];77 }else if(solutiontype ==='GiaIvinsSolution'){ 78 analyses=['GiaIvinsAnalysis']; 79 79 80 80 }else if(solutiontype ==='TransientSolution'){ -
issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.m
r21260 r21530 64 64 elseif strcmp(solutiontype,'BedSlopeSolution') 65 65 analyses={'L2ProjectionBaseAnalysis'}; 66 elseif strcmp(solutiontype,'Gia Solution')67 analyses={'Gia Analysis'};66 elseif strcmp(solutiontype,'GiaIvinsSolution') 67 analyses={'GiaIvinsAnalysis'}; 68 68 elseif strcmp(solutiontype,'EsaSolution') 69 69 analyses={'EsaAnalysis'}; -
issm/trunk-jpl/src/m/consistency/ismodelselfconsistent.py
r21097 r21530 31 31 analyses=['L2ProjectionBaseAnalysis'] 32 32 33 elif solutiontype == 'Gia Solution':34 analyses=['Gia Analysis']33 elif solutiontype == 'GiaIvinsSolution': 34 analyses=['GiaIvinsAnalysis'] 35 35 36 36 elif solutiontype == 'TransientSolution': -
issm/trunk-jpl/src/m/contrib/defleurian/netCDF/ClassTry.py
r21097 r21530 70 70 'transient':'transient',\ 71 71 'calving':'calving',\ 72 'gia':'gia',\72 'giaivins':'giaivins',\ 73 73 'autodiff':'autodiff',\ 74 74 'inversion':'inversion',\ -
issm/trunk-jpl/src/m/solve/solve.js
r21143 r21530 18 18 // - 'Hydrology' or 'hy' 19 19 // - 'DamageEvolution' or 'da' 20 // - 'Gia ' or 'gia'20 // - 'GiaIvins' or 'giaivins' 21 21 // - 'Sealevelrise' or 'slr' 22 22 // … … 59 59 }else if((solutionstring.toLowerCase() === 'da') || (solutionstring.toLowerCase() === 'damageevolution')){ 60 60 solutionstring = 'DamageEvolutionSolution'; 61 }else if((solutionstring.toLowerCase() === 'gia ') || (solutionstring.toLowerCase() === 'gia')){62 solutionstring = 'Gia Solution';61 }else if((solutionstring.toLowerCase() === 'giaivins') || (solutionstring.toLowerCase() === 'giaivins')){ 62 solutionstring = 'GiaIvinsSolution'; 63 63 }else if((solutionstring.toLowerCase() === 'slr') || (solutionstring.toLowerCase() === 'sealevelrise')){ 64 64 solutionstring = 'SealevelriseSolution'; -
issm/trunk-jpl/src/m/solve/solve.m
r21353 r21530 18 18 % - 'Hydrology' or 'hy' 19 19 % - 'DamageEvolution' or 'da' 20 % - 'Gia ' or 'gia'20 % - 'GiaIvins' or 'giaivins' 21 21 % - 'Esa' or 'esa' 22 22 % - 'Sealevelrise' or 'slr' … … 62 62 elseif strcmpi(solutionstring,'da') || strcmpi(solutionstring,'DamageEvolution') 63 63 solutionstring = 'DamageEvolutionSolution'; 64 elseif strcmpi(solutionstring,'gia ') || strcmpi(solutionstring,'Gia')65 solutionstring = 'Gia Solution';64 elseif strcmpi(solutionstring,'giaivins') || strcmpi(solutionstring,'GiaIvins') 65 solutionstring = 'GiaIvinsSolution'; 66 66 elseif strcmpi(solutionstring,'esa') || strcmpi(solutionstring,'Esa') 67 67 solutionstring = 'EsaSolution'; -
issm/trunk-jpl/src/m/solve/solve.py
r21303 r21530 28 28 - 'Hydrology' or 'hy' 29 29 - 'DamageEvolution' or 'da' 30 - 'Gia ' or 'gia'30 - 'GiaIvins' or 'giaivins' 31 31 - 'Sealevelrise' or 'slr' 32 32 … … 64 64 elif solutionstring.lower() == 'da' or solutionstring.lower() == 'damageevolution': 65 65 solutionstring = 'DamageEvolutionSolution'; 66 elif solutionstring.lower() == 'gia ' or solutionstring.lower() == 'gia':67 solutionstring = 'Gia Solution';66 elif solutionstring.lower() == 'giaivins' or solutionstring.lower() == 'giaivins': 67 solutionstring = 'GiaIvinsSolution'; 68 68 elif solutionstring.lower() == 'slr' or solutionstring.lower() == 'sealevelrise': 69 69 solutionstring = 'SealevelriseSolution';
Note:
See TracChangeset
for help on using the changeset viewer.
