Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 17734) @@ -213,5 +213,4 @@ basalelement -> JacobianDeterminant(&Jdet,xyz_list,gauss); SedTrans_input -> GetInputValue(&sediment_transmitivity,gauss); - /*Diffusivity*/ D_scalar=sediment_transmitivity*gauss->weight*Jdet; @@ -672,2 +671,3 @@ } }/*}}}*/ + Index: /issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp (revision 17734) @@ -117,5 +117,5 @@ case TransientSolutionEnum: - numanalyses=16; + numanalyses=21; analyses=xNew(numanalyses); analyses[ 0]=StressbalanceAnalysisEnum; @@ -135,4 +135,9 @@ analyses[14]=LsfReinitializationAnalysisEnum; analyses[15]=DamageEvolutionAnalysisEnum; + analyses[16]=HydrologyShreveAnalysisEnum; + analyses[17]=HydrologyDCInefficientAnalysisEnum; + analyses[18]=HydrologyDCEfficientAnalysisEnum; + analyses[19]=L2ProjectionBaseAnalysisEnum; + analyses[20]=L2ProjectionEPLAnalysisEnum; break; Index: /issm/trunk-jpl/src/c/cores/hydrology_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/hydrology_core.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/cores/hydrology_core.cpp (revision 17734) @@ -12,21 +12,12 @@ void hydrology_core(FemModel* femmodel){ - int i; - /*intermediary*/ - int step,nsteps; - int output_frequency,hydrology_model; + int hydrology_model; bool save_results; bool modify_loads=true; bool isefficientlayer; - IssmDouble starttime,final_time; - IssmDouble time,dt; /*first recover parameters common to all solutions*/ - femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum); - femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum); - femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum); femmodel->parameters->FindParam(&save_results,SaveResultsEnum); - femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum); femmodel->parameters->FindParam(&hydrology_model,HydrologyModelEnum); @@ -37,73 +28,52 @@ } - /*Compute number of time steps: */ - if((dt==0)|| (final_time==0)){ - dt=0; - nsteps=1; + /*Using the Shreve based Model*/ + if (hydrology_model==HydrologyshreveEnum){ + if(VerboseSolution()) _printf0_(" computing water column\n"); + femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum); + solutionsequence_nonlinear(femmodel,modify_loads); + + /*transfer water column thickness to old water column thickness: */ + + InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum); + + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results \n"); + int outputs[3] = {WatercolumnEnum,HydrologyWaterVxEnum,HydrologyWaterVyEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); + + /*unload results*/ + if(VerboseSolution()) _printf0_(" saving temporary results\n"); + OutputResultsx(femmodel); + } } - else nsteps=reCast((final_time-starttime)/dt); - /*initialize: */ - step=0; - time=starttime; - - /*Loop through time: */ - for(i=0;iparameters->SetParam(time,TimeEnum); - femmodel->parameters->SetParam(step,StepEnum); - - /*Using the Shreve based Model*/ - if (hydrology_model==HydrologyshreveEnum){ - if(VerboseSolution()) _printf0_(" computing water column\n"); - femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum); - solutionsequence_nonlinear(femmodel,modify_loads); - - /*transfer water column thickness to old water column thickness: */ - - InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum); - - if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps || i==0)){ - if(VerboseSolution()) _printf0_(" saving results \n"); - int outputs[3] = {WatercolumnEnum,HydrologyWaterVxEnum,HydrologyWaterVyEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); - - /*unload results*/ - if(VerboseSolution()) _printf0_(" saving temporary results\n"); - OutputResultsx(femmodel); + /*Using the double continuum model*/ + else if (hydrology_model==HydrologydcEnum){ + InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum); + femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); + if (isefficientlayer){ + InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum); + InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum); + } + + /*Proceed now to heads computations*/ + if(VerboseSolution()) _printf0_(" computing water head\n"); + solutionsequence_hydro_nonlinear(femmodel); + if(save_results){ + if(VerboseSolution()) _printf0_(" saving results \n"); + if(isefficientlayer){ + int outputs[8] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,HydrologydcMaskEplactiveEltEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],8); } + else{ + int outputs[2] = {SedimentHeadEnum,SedimentHeadResidualEnum}; + femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); + } + /*unload results*/ + if(VerboseSolution()) _printf0_(" saving temporary results\n"); + OutputResultsx(femmodel); } - - /*Using the double continuum model*/ - else if (hydrology_model==HydrologydcEnum){ - InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum); - femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); - if (isefficientlayer){ - InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum); - InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum); - } - - /*Proceed now to heads computations*/ - if(VerboseSolution()) _printf0_(" computing water head\n"); - solutionsequence_hydro_nonlinear(femmodel); - if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps || i==0)){ - if(VerboseSolution()) _printf0_(" saving results \n"); - if(isefficientlayer){ - int outputs[8] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,HydrologydcMaskEplactiveEltEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],8); - } - else{ - int outputs[2] = {SedimentHeadEnum,SedimentHeadResidualEnum}; - femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); - } - /*unload results*/ - if(VerboseSolution()) _printf0_(" saving temporary results\n"); - OutputResultsx(femmodel); - } - } - } } + Index: /issm/trunk-jpl/src/c/cores/transient_core.cpp =================================================================== --- /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/cores/transient_core.cpp (revision 17734) @@ -22,5 +22,5 @@ int i; IssmDouble starttime,finaltime,dt,yts; - bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution; + bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology; bool save_results,dakota_analysis; bool time_adapt=false; @@ -52,4 +52,5 @@ femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); femmodel->parameters->FindParam(&isdamageevolution,TransientIsdamageevolutionEnum); + femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum); femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); @@ -95,5 +96,4 @@ while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime. - /*Increment*/ if(time_adapt){ @@ -117,4 +117,9 @@ if(VerboseSolution()) _printf0_(" computing thermal regime\n"); thermal_core(femmodel); + } + + if(ishydrology){ + if(VerboseSolution()) _printf0_(" computing water heads\n"); + hydrology_core(femmodel); } Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 17734) @@ -72,4 +72,5 @@ parameters->AddObject(iomodel->CopyConstantObject(TransientIslevelsetEnum)); parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum)); + parameters->AddObject(iomodel->CopyConstantObject(TransientIshydrologyEnum)); parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum)); parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum)); Index: /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17733) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h (revision 17734) @@ -281,4 +281,5 @@ TransientIsgiaEnum, TransientIsdamageevolutionEnum, + TransientIshydrologyEnum, TransientNumRequestedOutputsEnum, TransientRequestedOutputsEnum, Index: /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp (revision 17734) @@ -287,4 +287,5 @@ case TransientIsgiaEnum : return "TransientIsgia"; case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; + case TransientIshydrologyEnum : return "TransientIshydrology"; case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs"; case TransientRequestedOutputsEnum : return "TransientRequestedOutputs"; Index: /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17733) +++ /issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp (revision 17734) @@ -293,4 +293,5 @@ else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum; else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; + else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum; else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; @@ -382,9 +383,9 @@ else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; - else if (strcmp(name,"Loads")==0) return LoadsEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"Materials")==0) return MaterialsEnum; + if (strcmp(name,"Loads")==0) return LoadsEnum; + else if (strcmp(name,"Materials")==0) return MaterialsEnum; else if (strcmp(name,"Nodes")==0) return NodesEnum; else if (strcmp(name,"Contours")==0) return ContoursEnum; @@ -505,9 +506,9 @@ else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; - else if (strcmp(name,"Vy")==0) return VyEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"VyPicard")==0) return VyPicardEnum; + if (strcmp(name,"Vy")==0) return VyEnum; + else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; else if (strcmp(name,"Vz")==0) return VzEnum; else if (strcmp(name,"VzSSA")==0) return VzSSAEnum; @@ -628,9 +629,9 @@ else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum; - else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; else stage=6; } if(stage==6){ - if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; + if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; + else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; else if (strcmp(name,"Adjoint")==0) return AdjointEnum; Index: /issm/trunk-jpl/src/m/classes/transient.m =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.m (revision 17733) +++ /issm/trunk-jpl/src/m/classes/transient.m (revision 17734) @@ -13,4 +13,5 @@ isdamageevolution = 0; islevelset = 0; + ishydrology = 0; requested_outputs = {}; end @@ -40,4 +41,19 @@ end end % }}} + function obj = deactivateall(obj) % {{{ + + %full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now + obj.ismasstransport = 0; + obj.isstressbalance = 0; + obj.isthermal = 0; + obj.isgroundingline = 0; + obj.isgia = 0; + obj.isdamageevolution = 0; + obj.islevelset = 0; + obj.ishydrology = 0; + + %default output + obj.requested_outputs={'default'}; + end % }}} function obj = setdefaultparameters(obj) % {{{ @@ -50,4 +66,5 @@ obj.isdamageevolution = 0; obj.islevelset = 0; + obj.ishydrology = 0; %default output @@ -73,4 +90,5 @@ md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]); + md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]); md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1); @@ -86,4 +104,5 @@ fielddisplay(obj,'isdamageevolution','indicates whether damage evolution is used in the transient'); fielddisplay(obj,'islevelset','LEVEL SET DESCRIPTION...'); + fielddisplay(obj,'ishydrology','indicates whether an hydrology model is used'); fielddisplay(obj,'requested_outputs','list of additional outputs requested'); @@ -96,4 +115,5 @@ WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean'); WriteData(fid,'object',obj,'fieldname','isdamageevolution','format','Boolean'); + WriteData(fid,'object',obj,'fieldname','ishydrology','format','Boolean'); WriteData(fid,'object',obj,'fieldname','islevelset','format','Boolean'); Index: /issm/trunk-jpl/src/m/classes/transient.py =================================================================== --- /issm/trunk-jpl/src/m/classes/transient.py (revision 17733) +++ /issm/trunk-jpl/src/m/classes/transient.py (revision 17734) @@ -20,4 +20,5 @@ self.isdamageevolution = False self.islevelset = False + self.ishydrology = False self.requested_outputs = [] @@ -35,4 +36,5 @@ string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient')) string="%s\n%s"%(string,fielddisplay(self,'islevelset','LEVELSET METHOD DESCRIPTION')) + string="%s\n%s"%(string,fielddisplay(self,'ishydrology','indicates whether an hydrology model is used')) string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested')) return string @@ -56,4 +58,5 @@ self.isdamageevolution = False self.islevelset = False + self.ishydrology = False #default output @@ -74,4 +77,5 @@ md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0,1]) + md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1]) md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1) @@ -86,4 +90,5 @@ WriteData(fid,'object',self,'fieldname','isdamageevolution','format','Boolean') WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean') + WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean') #process requested outputs Index: /issm/trunk-jpl/src/m/contrib/paraview/exportVTK.m =================================================================== --- /issm/trunk-jpl/src/m/contrib/paraview/exportVTK.m (revision 17733) +++ /issm/trunk-jpl/src/m/contrib/paraview/exportVTK.m (revision 17734) @@ -23,5 +23,10 @@ %get the element related variables -points=[model.mesh.x model.mesh.y model.mesh.z]; +if dimension(model.mesh)==2, + points=[model.mesh.x model.mesh.y zeros(model.mesh.numberofvertices,1)]; +else + points=[model.mesh.x model.mesh.y model.mesh.z]; +end + [num_of_points,dim]=size(points); [num_of_elt]=size(model.mesh.elements,1); Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17733) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 17734) @@ -279,4 +279,5 @@ def TransientIsgiaEnum(): return StringToEnum("TransientIsgia")[0] def TransientIsdamageevolutionEnum(): return StringToEnum("TransientIsdamageevolution")[0] +def TransientIshydrologyEnum(): return StringToEnum("TransientIshydrology")[0] def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0] def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0] Index: /issm/trunk-jpl/src/m/enum/TransientIshydrologyEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/TransientIshydrologyEnum.m (revision 17734) +++ /issm/trunk-jpl/src/m/enum/TransientIshydrologyEnum.m (revision 17734) @@ -0,0 +1,11 @@ +function macro=TransientIshydrologyEnum() +%TRANSIENTISHYDROLOGYENUM - Enum of TransientIshydrology +% +% WARNING: DO NOT MODIFY THIS FILE +% this file has been automatically generated by src/c/shared/Enum/Synchronize.sh +% Please read src/c/shared/Enum/README for more information +% +% Usage: +% macro=TransientIshydrologyEnum() + +macro=StringToEnum('TransientIshydrology'); Index: /issm/trunk-jpl/test/NightlyRun/test3300.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test3300.m (revision 17733) +++ /issm/trunk-jpl/test/NightlyRun/test3300.m (revision 17734) @@ -2,4 +2,6 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md.transient=deactivateall(md.transient); +md.transient.ishydrology=1; md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); @@ -45,10 +47,10 @@ md.timestepping.final_time=8.0; -md=solve(md,HydrologySolutionEnum()); +md=solve(md,TransientSolutionEnum()); field_names ={'SedimentWaterHead5','EplWaterHead5','SedimentWaterHead40','EplWaterHead40'}; field_tolerances={1e-13, 1e-13, 1e-13, 1e-13, 1e-13}; -field_values={md.results.HydrologySolution(5).SedimentHead, ... - md.results.HydrologySolution(5).EplHead,... - md.results.HydrologySolution(40).SedimentHead,... - md.results.HydrologySolution(40).EplHead}; +field_values={md.results.TransientSolution(5).SedimentHead, ... + md.results.TransientSolution(5).EplHead,... + md.results.TransientSolution(40).SedimentHead,... + md.results.TransientSolution(40).EplHead}; Index: /issm/trunk-jpl/test/NightlyRun/test332.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test332.m (revision 17733) +++ /issm/trunk-jpl/test/NightlyRun/test332.m (revision 17734) @@ -2,4 +2,6 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md.transient=deactivateall(md.transient); +md.transient.ishydrology=1; md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); Index: /issm/trunk-jpl/test/NightlyRun/test333.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test333.m (revision 17733) +++ /issm/trunk-jpl/test/NightlyRun/test333.m (revision 17734) @@ -2,4 +2,6 @@ md=setmask(md,'',''); md=parameterize(md,'../Par/SquareSheetConstrained.par'); +md.transient=deactivateall(md.transient); +md.transient.ishydrology=1; md=setflowequation(md,'SSA','all'); md.cluster=generic('name',oshostname(),'np',1); @@ -26,5 +28,5 @@ %md.verbose.solution=1; -md=solve(md,HydrologySolutionEnum()); +md=solve(md,TransientSolutionEnum()); %store=md.constants.g*md.hydrology.sediment_porosity*md.materials.rho_freshwater*((md.hydrology.sediment_compressibility/md.hydrology.sediment_porosity)+md.hydrology.water_compressibility); @@ -45,14 +47,14 @@ 1e-13, 1e-12, 8e-12,... 1e-13, 2e-12, 1e-11}; -field_values={md.results.HydrologySolution(1).SedimentHead, ... - md.results.HydrologySolution(1).EplHead,... - md.results.HydrologySolution(1).SedimentHeadResidual,... - md.results.HydrologySolution(4).SedimentHead,... - md.results.HydrologySolution(4).EplHead,... - md.results.HydrologySolution(4).SedimentHeadResidual, ... - md.results.HydrologySolution(5).SedimentHead,... - md.results.HydrologySolution(5).EplHead,... - md.results.HydrologySolution(5).SedimentHeadResidual, ... - md.results.HydrologySolution(9).SedimentHead,... - md.results.HydrologySolution(9).EplHead,... - md.results.HydrologySolution(9).SedimentHeadResidual}; +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: /issm/trunk-jpl/test/NightlyRun/test334.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test334.m (revision 17733) +++ /issm/trunk-jpl/test/NightlyRun/test334.m (revision 17734) @@ -1,4 +1,6 @@ md=triangle(model(),'../Exp/Square.exp',100000.); md=setmask(md,'',''); +md.transient=deactivateall(md.transient); +md.transient.ishydrology=1; md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setflowequation(md,'SSA','all'); Index: /issm/trunk-jpl/test/NightlyRun/test335.m =================================================================== --- /issm/trunk-jpl/test/NightlyRun/test335.m (revision 17733) +++ /issm/trunk-jpl/test/NightlyRun/test335.m (revision 17734) @@ -1,4 +1,6 @@ md=triangle(model(),'../Exp/Square.exp',100000.); md=setmask(md,'',''); +md.transient=deactivateall(md.transient); +md.transient.ishydrology=1; md=parameterize(md,'../Par/SquareSheetConstrained.par'); md=setflowequation(md,'SSA','all'); @@ -26,5 +28,5 @@ %md.verbose.solution=1; md=extrude(md,3,1.1); -md=solve(md,HydrologySolutionEnum()); +md=solve(md,TransientSolutionEnum()); %store=md.constants.g*md.hydrology.sediment_porosity* ... @@ -51,14 +53,14 @@ 1e-13, 1e-12, 9e-12,... 1e-13, 9e-13, 1e-11}; -field_values={md.results.HydrologySolution(1).SedimentHead, ... - md.results.HydrologySolution(1).EplHead,... - md.results.HydrologySolution(1).SedimentHeadResidual,... - md.results.HydrologySolution(4).SedimentHead,... - md.results.HydrologySolution(4).EplHead,... - md.results.HydrologySolution(4).SedimentHeadResidual, ... - md.results.HydrologySolution(5).SedimentHead,... - md.results.HydrologySolution(5).EplHead,... - md.results.HydrologySolution(5).SedimentHeadResidual, ... - md.results.HydrologySolution(9).SedimentHead,... - md.results.HydrologySolution(9).EplHead,... - md.results.HydrologySolution(9).SedimentHeadResidual}; +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};