Index: /issm/trunk-jpl/src/m/classes/model.m =================================================================== --- /issm/trunk-jpl/src/m/classes/model.m (revision 25167) +++ /issm/trunk-jpl/src/m/classes/model.m (revision 25168) @@ -1263,5 +1263,5 @@ md.calving = calving(); md.frontalforcings = frontalforcings(); - md.gia = giamme(); + md.gia = giamme(); md.esa = esa(); md.love = fourierlove(); @@ -1270,5 +1270,5 @@ md.inversion = inversion(); md.qmu = qmu(); - md.amr = amr(); + md.amr = amr(); md.radaroverlay = radaroverlay(); md.results = struct(); Index: /issm/trunk-jpl/src/m/classes/results.py =================================================================== --- /issm/trunk-jpl/src/m/classes/results.py (revision 25167) +++ /issm/trunk-jpl/src/m/classes/results.py (revision 25168) @@ -3,10 +3,17 @@ class results(object): - """ + ''' RESULTS class definition Usage: results = results() - """ + + TODO: + - Modify output so that it matches that of + + disp(md.results.<>) + + where <> is one of the values from solve.m + ''' def __init__(self, *args): # {{{ Index: /issm/trunk-jpl/src/m/classes/slr.m =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.m (revision 25167) +++ /issm/trunk-jpl/src/m/classes/slr.m (revision 25168) @@ -31,5 +31,4 @@ horiz = 0; planetradius = planetradius('earth'); - requested_outputs = {}; transitions = {}; Index: /issm/trunk-jpl/src/m/classes/slr.py =================================================================== --- /issm/trunk-jpl/src/m/classes/slr.py (revision 25167) +++ /issm/trunk-jpl/src/m/classes/slr.py (revision 25168) @@ -36,5 +36,4 @@ self.rotation = 0 self.ocean_area_scaling = 0 - self.steric_rate = 0 #rate of ocean expansion from steric effects. self.hydro_rate = 0 #rate of steric expansion from hydrological effects. self.geodetic_run_frequency = 1 #how many time steps we skip before we run the geodetic part of the solver during transient @@ -68,8 +67,5 @@ string = "%s\n%s" % (string, fielddisplay(self, 'angular_velocity', 'mean rotational velocity of earth [per second]')) string = "%s\n%s" % (string, fielddisplay(self, 'ocean_area_scaling', 'correction for model representation of ocean area [default: No correction]')) - string = "%s\n%s" % (string, fielddisplay(self, 'steric_rate', 'rate of steric ocean expansion [mm / yr]')) string = "%s\n%s" % (string, fielddisplay(self, 'hydro_rate', 'rate of hydrological expansion [mm / yr]')) - string = "%s\n%s" % (string, fielddisplay(self, 'Ngia', 'rate of viscous (GIA) geoid expansion (in mm / yr)')) - string = "%s\n%s" % (string, fielddisplay(self, 'Ugia', 'rate of viscous (GIA) bedrock uplift (in mm / yr)')) string = "%s\n%s" % (string, fielddisplay(self, 'geodetic', 'compute geodetic SLR? (in addition to steric?) default 0')) string = "%s\n%s" % (string, fielddisplay(self, 'geodetic_run_frequency', 'how many time steps we skip before we run SLR solver during transient (default: 1)')) Index: /issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py =================================================================== --- /issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py (revision 25167) +++ /issm/trunk-jpl/src/m/solve/loadresultsfromcluster.py (revision 25168) @@ -7,10 +7,10 @@ def loadresultsfromcluster(md, runtimename=False): - """ + ''' LOADRESULTSFROMCLUSTER - load results of solution sequence from cluster Usage: md = loadresultsfromcluster(md, runtimename) - """ + ''' #retrieve cluster, to be able to call its methods @@ -74,5 +74,5 @@ TryRem('.bat', filename) - # remove this for bin file debugging + # remove this for bin file debugging TryRem('.bin', filename) Index: /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py =================================================================== --- /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py (revision 25167) +++ /issm/trunk-jpl/src/m/solve/loadresultsfromdisk.py (revision 25168) @@ -6,10 +6,10 @@ def loadresultsfromdisk(md, filename): - """ + ''' LOADRESULTSFROMDISK - load results of solution sequence from disk file "filename" Usage: md = loadresultsfromdisk(md=False,filename=False); - """ + ''' #check number of inputs/outputs if not md or not filename: @@ -53,5 +53,5 @@ #if only one solution, extract it from list for user friendliness - if len(structure) == 1 and not structure[0].SolutionType == 'TransientSolution': + if len(structure) == 1 and structure[0].SolutionType != 'TransientSolution': setattr(md.results, structure[0].SolutionType, structure[0]) Index: /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m =================================================================== --- /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m (revision 25167) +++ /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.m (revision 25168) @@ -40,5 +40,5 @@ %Add result if(result.step==0), - %if we have a step = 0, this is a steady state solutoin, don't expect more steps. + %if we have a step = 0, this is a steady state solution, don't expect more steps. index = 1; check_nomoresteps=1; Index: /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py =================================================================== --- /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py (revision 25167) +++ /issm/trunk-jpl/src/m/solve/parseresultsfromdisk.py (revision 25168) @@ -34,5 +34,5 @@ if check_nomoresteps: if loadres['step'] >= 1: - raise TypeError("parsing results for a steady - state core, which incorporates transient results!") + raise TypeError("parsing results for a steady-state core, which incorporates transient results!") #Check step, increase counter if this is a new step @@ -139,10 +139,10 @@ def ReadData(fid, md): # {{{ - """ + ''' READDATA - Usage: field = ReadData(fid, md) - """ + ''' #read field @@ -179,5 +179,5 @@ raise TypeError("cannot read data of datatype {}".format(datatype)) - #Process units here FIXME: this should not be done here! + #Process units here FIXME: this should not be done here! yts = md.constants.yts if fieldname == 'BalancethicknessThickeningRate': @@ -243,6 +243,6 @@ degmax = md.love.sh_nmax nfreq = md.love.nfreq - #for numpy 1.8 + only - #temp_field = np.full((degmax + 1, nfreq, nlayer + 1, 6), 0.0) + #for numpy 1.8 + only + #temp_field = np.full((degmax + 1, nfreq, nlayer + 1, 6), 0.0) temp_field = np.empty((degmax + 1, nfreq, nlayer + 1, 6)) temp_field.fill(0.0) Index: /issm/trunk-jpl/src/m/solve/solve.m =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.m (revision 25167) +++ /issm/trunk-jpl/src/m/solve/solve.m (revision 25168) @@ -7,19 +7,19 @@ % % solution types available comprise: -% - 'Stressbalance' or 'sb' -% - 'Masstransport' or 'mt' -% - 'Thermal' or 'th' -% - 'Steadystate' or 'ss' -% - 'Transient' or 'tr' -% - 'Balancethickness' or 'mc' +% - 'Stressbalance' or 'sb' +% - 'Masstransport' or 'mt' +% - 'Thermal' or 'th' +% - 'Steadystate' or 'ss' +% - 'Transient' or 'tr' +% - 'Balancethickness' or 'mc' % - 'Balancevelocity' or 'bv' -% - 'BedSlope' or 'bsl' -% - 'SurfaceSlope' or 'ssl' -% - 'Hydrology' or 'hy' +% - 'BedSlope' or 'bsl' +% - 'SurfaceSlope' or 'ssl' +% - 'Hydrology' or 'hy' % - 'DamageEvolution' or 'da' -% - 'Gia' or 'gia' -% - 'Esa' or 'esa' -% - 'Sealevelrise' or 'slr' -% - 'Love' or 'lv' +% - 'Gia' or 'gia' +% - 'Love' or 'lv' +% - 'Esa' or 'esa' +% - 'Sealevelrise' or 'slr' % % extra options: @@ -81,5 +81,9 @@ md.private.solution=solutionstring; cluster=md.cluster; -if strcmpi(getfieldvalue(options,'batch','no'),'yes') batch=1; else batch=0; end +if strcmpi(getfieldvalue(options,'batch','no'),'yes') + batch=1; +else + batch=0; +end %check model consistency Index: /issm/trunk-jpl/src/m/solve/solve.py =================================================================== --- /issm/trunk-jpl/src/m/solve/solve.py (revision 25167) +++ /issm/trunk-jpl/src/m/solve/solve.py (revision 25168) @@ -12,5 +12,5 @@ def solve(md, solutionstring, *args): - """ + ''' SOLVE - apply solution sequence for this model @@ -44,5 +44,5 @@ md = solve(md, 'Stressbalance') md = solve(md, 'sb') - """ + ''' #recover and process solve options Index: /issm/trunk-jpl/src/m/solve/solveslm.m =================================================================== --- /issm/trunk-jpl/src/m/solve/solveslm.m (revision 25167) +++ /issm/trunk-jpl/src/m/solve/solveslm.m (revision 25168) @@ -7,6 +7,6 @@ % % solution types available comprise: -% - 'Sealevelrise' -% - 'Transient' +% - 'Sealevelrise' +% - 'Transient' % % extra options: Index: /issm/trunk-jpl/test/NightlyRun/runme.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/runme.py (revision 25167) +++ /issm/trunk-jpl/test/NightlyRun/runme.py (revision 25168) @@ -57,4 +57,7 @@ runme(exclude = 'Dakota', benchmark = 'all') runme(id = [[101, 102], ['Dakota', 'Slr']]) + + TODO: + - At '#disp test result', make sure precision of output matches """ #Get ISSM_DIR variable @@ -185,5 +188,5 @@ field = field.T if np.shape(field) != np.shape(archive): - raise RuntimeError("Field '{}'' from test is malformed; shape is {}, should be {} or {}".format(archive_name, np.shape(field.T), np.shape(archive), np.shape(archive.T))) + raise RuntimeError("Field '{}' from test is malformed; shape is {}, should be {} or {}".format(archive_name, np.shape(field.T), np.shape(archive), np.shape(archive.T))) error_diff = np.amax(np.abs(archive - field), axis=0) / (np.amax(np.abs(archive), axis=0) + float_info.epsilon) @@ -191,5 +194,5 @@ error_diff = error_diff[0] - #disp test result + #disp test result if (np.any(error_diff > tolerance) or np.isnan(error_diff)): print(('ERROR difference: {} > {} test id: {} test name: {} field: {}'.format(error_diff, tolerance, id, id_string, fieldname))) Index: /issm/trunk-jpl/test/NightlyRun/test2010.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.m (revision 25167) +++ /issm/trunk-jpl/test/NightlyRun/test2010.m (revision 25168) @@ -69,5 +69,6 @@ %eustatic + rigid + elastic run: md.solidearth.settings.rigid=1; -md.solidearth.settings.elastic=1; md.solidearth.settings.rotation=1; +md.solidearth.settings.elastic=1; +md.solidearth.settings.rotation=1; md.cluster=generic('name',oshostname(),'np',3); Index: /issm/trunk-jpl/test/NightlyRun/test2010.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 25167) +++ /issm/trunk-jpl/test/NightlyRun/test2010.py (revision 25168) @@ -80,5 +80,5 @@ md.solidearth.settings.reltol = np.nan md.solidearth.settings.abstol = 1e-3 -md.solidearth.settings.geodetic = 1 +md.solidearth.settings.computesealevelchange = 1 # }}} @@ -109,3 +109,3 @@ field_names = ['eus', 'slr', 'moixz', 'moiyz', 'moizz'] field_tolerances = [1e-13, 1e-13, 1e-13, 1e-13, 1e-13] -field_values = [eus, solidearth, moixz, moiyz, moizz] +field_values = [eus, slr, moixz, moiyz, moizz]