Index: ../trunk-jpl/test/NightlyRun/test334.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test334.m (revision 24241) +++ ../trunk-jpl/test/NightlyRun/test334.m (revision 24242) @@ -31,4 +31,4 @@ %analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity)) field_names ={'SedimentWaterHead','SedimentHeadResidual'}; field_tolerances={1e-13, 3e-10}; -field_values={md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual}; +field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual}; Index: ../trunk-jpl/test/NightlyRun/test335.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test335.m (revision 24241) +++ ../trunk-jpl/test/NightlyRun/test335.m (revision 24242) @@ -11,6 +11,7 @@ md.hydrology=initialize(md.hydrology,md); md.hydrology.isefficientlayer=1; md.hydrology.sedimentlimit_flag=1; +md.hydrology.transfer_flag = 0; md.hydrology.sedimentlimit=800.0; md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1); md.hydrology.mask_thawed_node=ones(md.mesh.numberofvertices,1); @@ -51,22 +52,22 @@ %Fields and tolerances to track changes field_names ={'SedimentWaterHead1','EplWaterHead1','SedimentHeadResidual1',... - 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',... - 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',... - 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9'}; + 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',... + 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',... + 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9'}; field_tolerances={1e-13, 1e-13, 1e-13,... - 1e-13, 1e-13, 1e-13,... - 1e-13, 5e-12, 2e-11,... - 1e-13, 5e-12, 2e-11}; -field_values={md.results.TransientSolution(1).SedimentHeadHydrostep, ... - md.results.TransientSolution(1).EplHeadHydrostep,... - md.results.TransientSolution(1).SedimentHeadResidual,... - md.results.TransientSolution(4).SedimentHeadHydrostep,... - md.results.TransientSolution(4).EplHeadHydrostep,... - md.results.TransientSolution(4).SedimentHeadResidual, ... - md.results.TransientSolution(5).SedimentHeadHydrostep,... - md.results.TransientSolution(5).EplHeadHydrostep,... - md.results.TransientSolution(5).SedimentHeadResidual, ... - md.results.TransientSolution(9).SedimentHeadHydrostep,... - md.results.TransientSolution(9).EplHeadHydrostep,... - md.results.TransientSolution(9).SedimentHeadResidual}; + 1e-13, 1e-13, 1e-13,... + 1e-13, 5e-12, 2e-11,... + 1e-13, 5e-12, 2e-11}; +field_values={md.results.TransientSolution(1).SedimentHead, ... + md.results.TransientSolution(1).EplHead,... + md.results.TransientSolution(1).SedimentHeadResidual,... + md.results.TransientSolution(4).SedimentHead,... + md.results.TransientSolution(4).EplHead,... + md.results.TransientSolution(4).SedimentHeadResidual, ... + md.results.TransientSolution(5).SedimentHead,... + md.results.TransientSolution(5).EplHead,... + md.results.TransientSolution(5).SedimentHeadResidual, ... + md.results.TransientSolution(9).SedimentHead,... + md.results.TransientSolution(9).EplHead,... + md.results.TransientSolution(9).SedimentHeadResidual}; Index: ../trunk-jpl/test/NightlyRun/test330.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test330.m (revision 24241) +++ ../trunk-jpl/test/NightlyRun/test330.m (revision 24242) @@ -41,8 +41,8 @@ %fields to track, results can also be found in %Wang 2009 Fig 6b (jouranl of Hydrology) field_names={'SedimentWaterHead1',... - 'SedimentWaterHead2'}; + 'SedimentWaterHead2'}; field_tolerances={1e-13,... - 1e-13}; -field_values={md.results.TransientSolution(11).SedimentHeadHydrostep,... - md.results.TransientSolution(31).SedimentHeadHydrostep}; + 1e-13}; +field_values={md.results.TransientSolution(11).SedimentHead,... + md.results.TransientSolution(31).SedimentHead}; Index: ../trunk-jpl/test/NightlyRun/test332.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test332.m (revision 24241) +++ ../trunk-jpl/test/NightlyRun/test332.m (revision 24242) @@ -29,4 +29,4 @@ %analitic=(md.mesh.y.^2-2*md.mesh.y*1.0e6)*(-2.0/(2*md.constants.yts*md.hydrology.sediment_transmitivity)) field_names ={'SedimentWaterHead','SedimentHeadResidual'}; field_tolerances={1e-13, 3e-10}; -field_values={md.results.HydrologySolution.SedimentHeadHydrostep,md.results.HydrologySolution.SedimentHeadResidual}; +field_values={md.results.HydrologySolution.SedimentHead,md.results.HydrologySolution.SedimentHeadResidual}; Index: ../trunk-jpl/test/NightlyRun/test333.m =================================================================== --- ../trunk-jpl/test/NightlyRun/test333.m (revision 24241) +++ ../trunk-jpl/test/NightlyRun/test333.m (revision 24242) @@ -12,6 +12,7 @@ md.hydrology.isefficientlayer=1; md.hydrology.sedimentlimit_flag=1; md.hydrology.sedimentlimit=800.0; +md.hydrology.transfer_flag = 0 md.initialization.sediment_head=0.0*ones(md.mesh.numberofvertices,1); md.hydrology.spcsediment_head=NaN*ones(md.mesh.numberofvertices,1); md.basalforcings.groundedice_melting_rate = 2.0*ones(md.mesh.numberofvertices,1); @@ -53,23 +54,25 @@ 'SedimentWaterHead4','EplWaterHead4','SedimentHeadResidual4',... 'SedimentWaterHead5','EplWaterHead5','SedimentHeadResidual5',... 'SedimentWaterHead9','EplWaterHead9','SedimentHeadResidual9',... - 'EplWaterHead10'}; + 'EplWaterHead10', 'EplWaterHeadSubstep10', 'SedimentWaterHead10',... + 'SedimentWaterHeadSubstep10'}; field_tolerances={... - 1e-13, 1e-13, 1e-13,... - 1e-13, 1e-13, 1e-13,... - 1e-13, 5e-12, 1e-11,... - 1e-13, 5e-12, 1e-11,... - 1e-13}; + 1e-13, 1e-13, 1e-13,... + 1e-13, 1e-13, 1e-13,... + 1e-13, 5e-12, 1e-11,... + 1e-13, 5e-12, 1e-11,... + 1e-13, 1e-13, 1e-13,... + 1e-13}; field_values={mdfine.results.TransientSolution(1).SedimentHeadHydrostep, ... - mdfine.results.TransientSolution(1).EplHeadHydrostep,... - mdfine.results.TransientSolution(1).SedimentHeadResidual,... - mdfine.results.TransientSolution(4).SedimentHeadHydrostep,... - mdfine.results.TransientSolution(4).EplHeadHydrostep,... - mdfine.results.TransientSolution(4).SedimentHeadResidual, ... - mdfine.results.TransientSolution(5).SedimentHeadHydrostep,... - mdfine.results.TransientSolution(5).EplHeadHydrostep,... - mdfine.results.TransientSolution(5).SedimentHeadResidual, ... - mdfine.results.TransientSolution(9).SedimentHeadHydrostep,... - mdfine.results.TransientSolution(9).EplHeadHydrostep,... - mdfine.results.TransientSolution(9).SedimentHeadResidual,... + mdfine.results.TransientSolution(1).EplHeadHydrostep,... + mdfine.results.TransientSolution(1).SedimentHeadResidual,... + mdfine.results.TransientSolution(4).SedimentHeadHydrostep,... + mdfine.results.TransientSolution(4).EplHeadHydrostep,... + mdfine.results.TransientSolution(4).SedimentHeadResidual, ... + mdfine.results.TransientSolution(5).SedimentHeadHydrostep,... + mdfine.results.TransientSolution(5).EplHeadHydrostep,... + mdfine.results.TransientSolution(5).SedimentHeadResidual, ... + mdfine.results.TransientSolution(9).SedimentHeadHydrostep,... + mdfine.results.TransientSolution(9).EplHeadHydrostep,... + mdfine.results.TransientSolution(9).SedimentHeadResidual,... md.results.TransientSolution(1).EplHead};