Index: /issm/trunk-jpl/test/NightlyRun/test330.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.m (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test330.m (revision 22857) @@ -38,5 +38,5 @@ md=solve(md,'Transient'); -%fields to track, results can also be found in +%fields to track, results can also be found in %Wang 2009 Fig 6b (jouranl of Hydrology) field_names={'SedimentWaterHead1',... @@ -44,4 +44,4 @@ field_tolerances={1e-13,... 1e-13}; -field_values={md.results.TransientSolution(11).SedimentHead,... - md.results.TransientSolution(31).SedimentHead}; +field_values={md.results.TransientSolution(11).SedimentHeadHydrostep,... + md.results.TransientSolution(31).SedimentHeadHydrostep}; Index: /issm/trunk-jpl/test/NightlyRun/test330.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test330.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test330.py (revision 22857) @@ -49,10 +49,10 @@ md=solve(md,'Transient') -#fields to track, results can also be found in +#fields to track, results can also be found in #Wang 2009 Fig 6b (jouranl of Hydrology) field_names=['SedimentWaterHead1', 'SedimentWaterHead2'] -field_tolerances=[1e-13, +field_tolerances=[1e-13, 1e-13] -field_values=[md.results.TransientSolution[10].SedimentHead, - md.results.TransientSolution[30].SedimentHead] +field_values=[md.results.TransientSolution[10].SedimentHeadHydrostep, + md.results.TransientSolution[30].SedimentHeadHydrostep] Index: /issm/trunk-jpl/test/NightlyRun/test3300.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test3300.py (revision 22857) @@ -66,11 +66,11 @@ for i in range(0,4000): sedvol[i]=np.mean(md.results.TransientSolution[i].SedimentHead)*sedstore - eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThickness) + eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThicknessHydrostep) totvol[i+1]=totvol[i]+md.basalforcings.groundedice_melting_rate[0,i]*0.002 field_names =['SedimentWaterHead5','EplWaterHead5','SedimentWaterHead40','EplWaterHead40'] field_tolerances=[1e-13, 1e-13, 1e-13, 1e-13, 1e-13] -field_values=[md.results.TransientSolution[5].SedimentHead, - md.results.TransientSolution[5].EplHead, - md.results.TransientSolution[40].SedimentHead, - md.results.TransientSolution[40].EplHead] +field_values=[md.results.TransientSolution[5].SedimentHeadHydrostep, + md.results.TransientSolution[5].EplHeadHydrostep, + md.results.TransientSolution[40].SedimentHeadHydrostep, + md.results.TransientSolution[40].EplHeadHydrostep] Index: /issm/trunk-jpl/test/NightlyRun/test332.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.m (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test332.m (revision 22857) @@ -29,3 +29,3 @@ field_names ={'SedimentWaterHead','SedimentHeadResidual'}; field_tolerances={1e-13, 3e-10}; -field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual}; +field_values={md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual}; Index: /issm/trunk-jpl/test/NightlyRun/test332.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test332.py (revision 22857) @@ -45,3 +45,3 @@ field_names =['SedimentWaterHead','SedimentHeadResidual'] field_tolerances=[1e-13, 3e-10] -field_values=[md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual] +field_values=[md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual] Index: /issm/trunk-jpl/test/NightlyRun/test333.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.m (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test333.m (revision 22857) @@ -28,5 +28,6 @@ md.hydrology.epl_colapse_thickness=1.0e-3; md.hydrology.epl_max_thickness=1; -md.timestepping.time_step=0.2; +md.hydrology.steps_per_step=10; +md.timestepping.time_step=2.0; md.timestepping.final_time=2.0; @@ -39,5 +40,5 @@ mdfine.hydrology.steps_per_step=1; mdfine.timestepping.time_step=0.2; -mdfine=solve(md,'Transient'); +mdfine=solve(mdfine,'Transient'); %store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility); @@ -52,5 +53,5 @@ 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',... 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9',... - 'EplWaterHead9'}; + 'EplWaterHead10'}; field_tolerances={... 1e-13, 1e-13, 1e-13,... @@ -59,15 +60,15 @@ 1e-13, 5e-12, 1e-11,... 1e-13}; -field_values={mdfine.results.TransientSolution(1).SedimentHead, ... - mdfine.results.TransientSolution(1).EplHead,... +field_values={mdfine.results.TransientSolution(1).SedimentHeadHydrostep, ... + mdfine.results.TransientSolution(1).EplHeadHydrostep,... mdfine.results.TransientSolution(1).SedimentHeadResidual,... - mdfine.results.TransientSolution(4).SedimentHead,... - mdfine.results.TransientSolution(4).EplHead,... + mdfine.results.TransientSolution(4).SedimentHeadHydrostep,... + mdfine.results.TransientSolution(4).EplHeadHydrostep,... mdfine.results.TransientSolution(4).SedimentHeadResidual, ... - mdfine.results.TransientSolution(5).SedimentHead,... - mdfine.results.TransientSolution(5).EplHead,... + mdfine.results.TransientSolution(5).SedimentHeadHydrostep,... + mdfine.results.TransientSolution(5).EplHeadHydrostep,... mdfine.results.TransientSolution(5).SedimentHeadResidual, ... - mdfine.results.TransientSolution(9).SedimentHead,... - mdfine.results.TransientSolution(9).EplHead,... + mdfine.results.TransientSolution(9).SedimentHeadHydrostep,... + mdfine.results.TransientSolution(9).EplHeadHydrostep,... mdfine.results.TransientSolution(9).SedimentHeadResidual,... md.results.TransientSolution(1).EplHead}; Index: /issm/trunk-jpl/test/NightlyRun/test333.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test333.py (revision 22857) @@ -49,25 +49,22 @@ #re-run with no substeps -mdfine=md +mdfine=copy.deepcopy(md) mdfine.result=[] mdfine.hydrology.steps_per_step=1 mdfine.timestepping.time_step=0.2 -mdfine=solve(md,'Transient') +mdfine=solve(mdfine,'Transient') -# sedvol=np.zeros(10) -# eplvol=np.zeros(10) -# time=np.arange(0.2,2.1,0.2) -# store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility) -# sedstore=20.0*store -# for i in range(0,10): -# sedvol[i]=np.mean(md.results.TransientSolution[i].SedimentHead)*sedstore -# eplvol[i]=np.mean(md.results.TransientSolution[i].EplHead)*store*np.mean(md.results.TransientSolution[i].HydrologydcEplThickness) +sedmean=mdfine.results.TransientSolution[0].SedimentHeadHydrostep +eplmean=mdfine.results.TransientSolution[0].EplHeadHydrostep +for i in range(1,10): + sedmean=sedmean+(mdfine.results.TransientSolution[i].SedimentHeadHydrostep) + eplmean=eplmean+(mdfine.results.TransientSolution[i].EplHeadHydrostep) field_names=['SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1', 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4', 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5', - 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9', - 'EplWaterHead9'] + 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9', + 'EplWaterHead10'] field_tolerances=[1e-13, 1e-13, 1e-13, 1e-13, 1e-13, 1e-13, @@ -75,16 +72,15 @@ 1e-13, 5e-12, 1e-11, 1e-13] -field_values=[mdfine.results.TransientSolution[0].SedimentHead, - mdfine.results.TransientSolution[0].EplHead, +field_values=[mdfine.results.TransientSolution[0].SedimentHeadHydrostep, + mdfine.results.TransientSolution[0].EplHeadHydrostep, mdfine.results.TransientSolution[0].SedimentHeadResidual, - mdfine.results.TransientSolution[3].SedimentHead, - mdfine.results.TransientSolution[3].EplHead, + mdfine.results.TransientSolution[3].SedimentHeadHydrostep, + mdfine.results.TransientSolution[3].EplHeadHydrostep, mdfine.results.TransientSolution[3].SedimentHeadResidual, - mdfine.results.TransientSolution[4].SedimentHead, - mdfine.results.TransientSolution[4].EplHead, + mdfine.results.TransientSolution[4].SedimentHeadHydrostep, + mdfine.results.TransientSolution[4].EplHeadHydrostep, mdfine.results.TransientSolution[4].SedimentHeadResidual, - mdfine.results.TransientSolution[8].SedimentHead, - mdfine.results.TransientSolution[8].EplHead, + mdfine.results.TransientSolution[8].SedimentHeadHydrostep, + mdfine.results.TransientSolution[8].EplHeadHydrostep, mdfine.results.TransientSolution[8].SedimentHeadResidual, - md.results.TransientSolution[0].EplHead] - + md.results.TransientSolution[-1].EplHead] Index: /issm/trunk-jpl/test/NightlyRun/test334.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.m (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test334.m (revision 22857) @@ -30,3 +30,3 @@ field_names ={'SedimentWaterHead','SedimentHeadResidual'}; field_tolerances={1e-13, 3e-10}; -field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual}; +field_values={md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual}; Index: /issm/trunk-jpl/test/NightlyRun/test334.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test334.py (revision 22857) @@ -45,4 +45,4 @@ field_names =['SedimentWaterHead','SedimentHeadResidual'] field_tolerances=[1e-13, 3e-10] -field_values=[md.results.HydrologySolution.SedimentHead, +field_values=[md.results.HydrologySolution.SedimentHeadHydrostep, md.results.HydrologySolution.SedimentHeadResidual] Index: /issm/trunk-jpl/test/NightlyRun/test335.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.m (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test335.m (revision 22857) @@ -58,14 +58,14 @@ 1e-13, 5e-12, 2e-11,... 1e-13, 5e-12, 2e-11}; -field_values={md.results.TransientSolution(1).SedimentHead, ... - md.results.TransientSolution(1).EplHead,... +field_values={md.results.TransientSolution(1).SedimentHeadHydrostep, ... + md.results.TransientSolution(1).EplHeadHydrostep,... md.results.TransientSolution(1).SedimentHeadResidual,... - md.results.TransientSolution(4).SedimentHead,... - md.results.TransientSolution(4).EplHead,... + md.results.TransientSolution(4).SedimentHeadHydrostep,... + md.results.TransientSolution(4).EplHeadHydrostep,... md.results.TransientSolution(4).SedimentHeadResidual, ... - md.results.TransientSolution(5).SedimentHead,... - md.results.TransientSolution(5).EplHead,... + md.results.TransientSolution(5).SedimentHeadHydrostep,... + md.results.TransientSolution(5).EplHeadHydrostep,... md.results.TransientSolution(5).SedimentHeadResidual, ... - md.results.TransientSolution(9).SedimentHead,... - md.results.TransientSolution(9).EplHead,... + md.results.TransientSolution(9).SedimentHeadHydrostep,... + md.results.TransientSolution(9).EplHeadHydrostep,... md.results.TransientSolution(9).SedimentHeadResidual}; Index: /issm/trunk-jpl/test/NightlyRun/test335.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test335.py (revision 22857) @@ -1,4 +1,4 @@ #Test Name: SquareSheetExtrudedHydrologyDCTwoLayers -import numpy as np +import numpy as np from model import * from socket import gethostname @@ -57,14 +57,14 @@ 1e-13, 5e-12, 2e-11, 1e-13, 5e-12, 2e-11] -field_values=[md.results.TransientSolution[0].SedimentHead, - md.results.TransientSolution[0].EplHead, +field_values=[md.results.TransientSolution[0].SedimentHeadHydrostep, + md.results.TransientSolution[0].EplHeadHydrostep, md.results.TransientSolution[0].SedimentHeadResidual, - md.results.TransientSolution[3].SedimentHead, - md.results.TransientSolution[3].EplHead, + md.results.TransientSolution[3].SedimentHeadHydrostep, + md.results.TransientSolution[3].EplHeadHydrostep, md.results.TransientSolution[3].SedimentHeadResidual, - md.results.TransientSolution[4].SedimentHead, - md.results.TransientSolution[4].EplHead, + md.results.TransientSolution[4].SedimentHeadHydrostep, + md.results.TransientSolution[4].EplHeadHydrostep, md.results.TransientSolution[4].SedimentHeadResidual, - md.results.TransientSolution[8].SedimentHead, - md.results.TransientSolution[8].EplHead, + md.results.TransientSolution[8].SedimentHeadHydrostep, + md.results.TransientSolution[8].EplHeadHydrostep, md.results.TransientSolution[8].SedimentHeadResidual] Index: /issm/trunk-jpl/test/NightlyRun/test703.py =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test703.py (revision 22856) +++ /issm/trunk-jpl/test/NightlyRun/test703.py (revision 22857) @@ -2,6 +2,6 @@ import numpy as np from scipy.interpolate import interp1d -from model import * -from setflowequation import * +from model import * +from setflowequation import * from solve import * from NowickiProfile import * @@ -56,8 +56,8 @@ #boundary conditions -md.stressbalance.spcvx = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvy = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.spcvz = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.stressbalance.referential = float('NaN') * np.ones((md.mesh.numberofvertices,6)) +md.stressbalance.spcvx = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvy = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.spcvz = np.nan * np.ones((md.mesh.numberofvertices,)) +md.stressbalance.referential = np.nan * np.ones((md.mesh.numberofvertices,6)) md.stressbalance.loadingforce = 0 * np.ones((md.mesh.numberofvertices,3)) md.stressbalance.spcvx[np.where(md.mesh.vertexflags(4))] = 800. @@ -78,5 +78,5 @@ md = setflowequation(md,'FS','all') md.flowequation.fe_FS = 'TaylorHood' -md.stressbalance.abstol = float('NaN') +md.stressbalance.abstol = np.nan md.miscellaneous.name = 'test703' @@ -85,16 +85,16 @@ md.timestepping.final_time = 0.000005 md.stressbalance.shelf_dampening = 1. -md.smb.mass_balance = np.zeros((md.mesh.numberofvertices,)) -md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices,)) -md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices,)) -md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices,)) +md.smb.mass_balance = np.zeros((md.mesh.numberofvertices)) +md.basalforcings.groundedice_melting_rate = np.zeros((md.mesh.numberofvertices)) +md.basalforcings.floatingice_melting_rate = np.zeros((md.mesh.numberofvertices)) +md.basalforcings.geothermalflux = np.zeros((md.mesh.numberofvertices)) posb = np.intersect1d(np.where(md.mesh.x > 0.), np.where(md.mesh.vertexonbase)) md.basalforcings.groundedice_melting_rate[posb] = 18. md.basalforcings.floatingice_melting_rate[posb] = 18. -md.initialization.vx = np.zeros((md.mesh.numberofvertices,)) -md.initialization.vy = np.zeros((md.mesh.numberofvertices,)) -md.initialization.pressure = np.zeros((md.mesh.numberofvertices,)) -md.masstransport.spcthickness = float('NaN') * np.ones((md.mesh.numberofvertices,)) -md.thermal.spctemperature = float('NaN') * np.ones((md.mesh.numberofvertices,)) +md.initialization.vx = np.zeros((md.mesh.numberofvertices)) +md.initialization.vy = np.zeros((md.mesh.numberofvertices)) +md.initialization.pressure = np.zeros((md.mesh.numberofvertices)) +md.masstransport.spcthickness = np.nan * np.ones((md.mesh.numberofvertices)) +md.thermal.spctemperature = np.nan * np.ones((md.mesh.numberofvertices)) md.transient.isthermal = 0 md.masstransport.isfreesurface = 1