![(please configure the [header_logo] section in trac.ini)](/trac/issm/chrome/common/trac_banner.png)
Changeset 17734
- Timestamp:
- 04/15/14 08:50:36 (11 years ago)
- Location:
- issm/trunk-jpl
- Files:
-
- 1 added
- 17 edited
-
src/c/analyses/HydrologyDCInefficientAnalysis.cpp (modified) (2 diffs)
-
src/c/cores/AnalysisConfiguration.cpp (modified) (2 diffs)
-
src/c/cores/hydrology_core.cpp (modified) (2 diffs)
-
src/c/cores/transient_core.cpp (modified) (4 diffs)
-
src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
-
src/c/shared/Enum/EnumDefinitions.h (modified) (1 diff)
-
src/c/shared/Enum/EnumToStringx.cpp (modified) (1 diff)
-
src/c/shared/Enum/StringToEnumx.cpp (modified) (4 diffs)
-
src/m/classes/transient.m (modified) (6 diffs)
-
src/m/classes/transient.py (modified) (5 diffs)
-
src/m/contrib/paraview/exportVTK.m (modified) (1 diff)
-
src/m/enum/EnumDefinitions.py (modified) (1 diff)
-
src/m/enum/TransientIshydrologyEnum.m (added)
-
test/NightlyRun/test3300.m (modified) (2 diffs)
-
test/NightlyRun/test332.m (modified) (1 diff)
-
test/NightlyRun/test333.m (modified) (3 diffs)
-
test/NightlyRun/test334.m (modified) (1 diff)
-
test/NightlyRun/test335.m (modified) (3 diffs)
Legend:
- Unmodified
- Added
- Removed
-
issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp
r17700 r17734 213 213 basalelement -> JacobianDeterminant(&Jdet,xyz_list,gauss); 214 214 SedTrans_input -> GetInputValue(&sediment_transmitivity,gauss); 215 216 215 /*Diffusivity*/ 217 216 D_scalar=sediment_transmitivity*gauss->weight*Jdet; … … 672 671 } 673 672 }/*}}}*/ 673 -
issm/trunk-jpl/src/c/cores/AnalysisConfiguration.cpp
r17642 r17734 117 117 118 118 case TransientSolutionEnum: 119 numanalyses= 16;119 numanalyses=21; 120 120 analyses=xNew<int>(numanalyses); 121 121 analyses[ 0]=StressbalanceAnalysisEnum; … … 135 135 analyses[14]=LsfReinitializationAnalysisEnum; 136 136 analyses[15]=DamageEvolutionAnalysisEnum; 137 analyses[16]=HydrologyShreveAnalysisEnum; 138 analyses[17]=HydrologyDCInefficientAnalysisEnum; 139 analyses[18]=HydrologyDCEfficientAnalysisEnum; 140 analyses[19]=L2ProjectionBaseAnalysisEnum; 141 analyses[20]=L2ProjectionEPLAnalysisEnum; 137 142 break; 138 143 -
issm/trunk-jpl/src/c/cores/hydrology_core.cpp
r17353 r17734 12 12 void hydrology_core(FemModel* femmodel){ 13 13 14 int i;15 16 14 /*intermediary*/ 17 int step,nsteps; 18 int output_frequency,hydrology_model; 15 int hydrology_model; 19 16 bool save_results; 20 17 bool modify_loads=true; 21 18 bool isefficientlayer; 22 IssmDouble starttime,final_time;23 IssmDouble time,dt;24 19 25 20 /*first recover parameters common to all solutions*/ 26 femmodel->parameters->FindParam(&starttime,TimesteppingStartTimeEnum);27 femmodel->parameters->FindParam(&final_time,TimesteppingFinalTimeEnum);28 femmodel->parameters->FindParam(&dt,TimesteppingTimeStepEnum);29 21 femmodel->parameters->FindParam(&save_results,SaveResultsEnum); 30 femmodel->parameters->FindParam(&output_frequency,SettingsOutputFrequencyEnum);31 22 femmodel->parameters->FindParam(&hydrology_model,HydrologyModelEnum); 32 23 … … 37 28 } 38 29 39 /*Compute number of time steps: */ 40 if((dt==0)|| (final_time==0)){ 41 dt=0; 42 nsteps=1; 30 /*Using the Shreve based Model*/ 31 if (hydrology_model==HydrologyshreveEnum){ 32 if(VerboseSolution()) _printf0_(" computing water column\n"); 33 femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum); 34 solutionsequence_nonlinear(femmodel,modify_loads); 35 36 /*transfer water column thickness to old water column thickness: */ 37 38 InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum); 39 40 if(save_results){ 41 if(VerboseSolution()) _printf0_(" saving results \n"); 42 int outputs[3] = {WatercolumnEnum,HydrologyWaterVxEnum,HydrologyWaterVyEnum}; 43 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); 44 45 /*unload results*/ 46 if(VerboseSolution()) _printf0_(" saving temporary results\n"); 47 OutputResultsx(femmodel); 48 } 43 49 } 44 else nsteps=reCast<int,IssmDouble>((final_time-starttime)/dt);45 50 46 /*initialize: */ 47 step=0; 48 time=starttime; 49 50 /*Loop through time: */ 51 for(i=0;i<nsteps;i++){ 52 53 if(nsteps)if(VerboseSolution()) _printf0_("time step:" << i+1 << "/" << nsteps << "\n"); 54 time+=dt; 55 step+=1; 56 femmodel->parameters->SetParam(time,TimeEnum); 57 femmodel->parameters->SetParam(step,StepEnum); 58 59 /*Using the Shreve based Model*/ 60 if (hydrology_model==HydrologyshreveEnum){ 61 if(VerboseSolution()) _printf0_(" computing water column\n"); 62 femmodel->SetCurrentConfiguration(HydrologyShreveAnalysisEnum); 63 solutionsequence_nonlinear(femmodel,modify_loads); 64 65 /*transfer water column thickness to old water column thickness: */ 66 67 InputDuplicatex(femmodel,WatercolumnEnum,WaterColumnOldEnum); 68 69 if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps || i==0)){ 70 if(VerboseSolution()) _printf0_(" saving results \n"); 71 int outputs[3] = {WatercolumnEnum,HydrologyWaterVxEnum,HydrologyWaterVyEnum}; 72 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],3); 73 74 /*unload results*/ 75 if(VerboseSolution()) _printf0_(" saving temporary results\n"); 76 OutputResultsx(femmodel); 51 /*Using the double continuum model*/ 52 else if (hydrology_model==HydrologydcEnum){ 53 InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum); 54 femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum); 55 if (isefficientlayer){ 56 InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum); 57 InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum); 58 } 59 60 /*Proceed now to heads computations*/ 61 if(VerboseSolution()) _printf0_(" computing water head\n"); 62 solutionsequence_hydro_nonlinear(femmodel); 63 if(save_results){ 64 if(VerboseSolution()) _printf0_(" saving results \n"); 65 if(isefficientlayer){ 66 int outputs[8] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,HydrologydcMaskEplactiveEltEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum}; 67 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],8); 77 68 } 69 else{ 70 int outputs[2] = {SedimentHeadEnum,SedimentHeadResidualEnum}; 71 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2); 72 } 73 /*unload results*/ 74 if(VerboseSolution()) _printf0_(" saving temporary results\n"); 75 OutputResultsx(femmodel); 78 76 } 79 80 /*Using the double continuum model*/81 else if (hydrology_model==HydrologydcEnum){82 InputDuplicatex(femmodel,SedimentHeadEnum,SedimentHeadOldEnum);83 femmodel->parameters->FindParam(&isefficientlayer,HydrologydcIsefficientlayerEnum);84 if (isefficientlayer){85 InputDuplicatex(femmodel,EplHeadEnum,EplHeadOldEnum);86 InputDuplicatex(femmodel,HydrologydcEplThicknessEnum,HydrologydcEplThicknessOldEnum);87 }88 89 /*Proceed now to heads computations*/90 if(VerboseSolution()) _printf0_(" computing water head\n");91 solutionsequence_hydro_nonlinear(femmodel);92 if(save_results && ((i+1)%output_frequency==0 || (i+1)==nsteps || i==0)){93 if(VerboseSolution()) _printf0_(" saving results \n");94 if(isefficientlayer){95 int outputs[8] = {SedimentHeadEnum,SedimentHeadResidualEnum,EplHeadEnum,HydrologydcMaskEplactiveNodeEnum,HydrologydcMaskEplactiveEltEnum,EplHeadSlopeXEnum,EplHeadSlopeYEnum,HydrologydcEplThicknessEnum};96 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],8);97 }98 else{99 int outputs[2] = {SedimentHeadEnum,SedimentHeadResidualEnum};100 femmodel->RequestedOutputsx(&femmodel->results,&outputs[0],2);101 }102 /*unload results*/103 if(VerboseSolution()) _printf0_(" saving temporary results\n");104 OutputResultsx(femmodel);105 }106 }107 108 77 } 109 78 } 79 -
issm/trunk-jpl/src/c/cores/transient_core.cpp
r17707 r17734 22 22 int i; 23 23 IssmDouble starttime,finaltime,dt,yts; 24 bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution ;24 bool isstressbalance,ismasstransport,isFS,isthermal,isgroundingline,isgia,islevelset,isdamageevolution,ishydrology; 25 25 bool save_results,dakota_analysis; 26 26 bool time_adapt=false; … … 52 52 femmodel->parameters->FindParam(&islevelset,TransientIslevelsetEnum); 53 53 femmodel->parameters->FindParam(&isdamageevolution,TransientIsdamageevolutionEnum); 54 femmodel->parameters->FindParam(&ishydrology,TransientIshydrologyEnum); 54 55 femmodel->parameters->FindParam(&isFS,FlowequationIsFSEnum); 55 56 if(isgroundingline) femmodel->parameters->FindParam(&groundingline_migration,GroundinglineMigrationEnum); … … 95 96 96 97 while(time < finaltime - (yts*DBL_EPSILON)){ //make sure we run up to finaltime. 97 98 98 /*Increment*/ 99 99 if(time_adapt){ … … 117 117 if(VerboseSolution()) _printf0_(" computing thermal regime\n"); 118 118 thermal_core(femmodel); 119 } 120 121 if(ishydrology){ 122 if(VerboseSolution()) _printf0_(" computing water heads\n"); 123 hydrology_core(femmodel); 119 124 } 120 125 -
issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp
r17700 r17734 72 72 parameters->AddObject(iomodel->CopyConstantObject(TransientIslevelsetEnum)); 73 73 parameters->AddObject(iomodel->CopyConstantObject(TransientIsdamageevolutionEnum)); 74 parameters->AddObject(iomodel->CopyConstantObject(TransientIshydrologyEnum)); 74 75 parameters->AddObject(iomodel->CopyConstantObject(MaterialsRheologyLawEnum)); 75 76 parameters->AddObject(iomodel->CopyConstantObject(AutodiffIsautodiffEnum)); -
issm/trunk-jpl/src/c/shared/Enum/EnumDefinitions.h
r17700 r17734 281 281 TransientIsgiaEnum, 282 282 TransientIsdamageevolutionEnum, 283 TransientIshydrologyEnum, 283 284 TransientNumRequestedOutputsEnum, 284 285 TransientRequestedOutputsEnum, -
issm/trunk-jpl/src/c/shared/Enum/EnumToStringx.cpp
r17700 r17734 287 287 case TransientIsgiaEnum : return "TransientIsgia"; 288 288 case TransientIsdamageevolutionEnum : return "TransientIsdamageevolution"; 289 case TransientIshydrologyEnum : return "TransientIshydrology"; 289 290 case TransientNumRequestedOutputsEnum : return "TransientNumRequestedOutputs"; 290 291 case TransientRequestedOutputsEnum : return "TransientRequestedOutputs"; -
issm/trunk-jpl/src/c/shared/Enum/StringToEnumx.cpp
r17700 r17734 293 293 else if (strcmp(name,"TransientIsgia")==0) return TransientIsgiaEnum; 294 294 else if (strcmp(name,"TransientIsdamageevolution")==0) return TransientIsdamageevolutionEnum; 295 else if (strcmp(name,"TransientIshydrology")==0) return TransientIshydrologyEnum; 295 296 else if (strcmp(name,"TransientNumRequestedOutputs")==0) return TransientNumRequestedOutputsEnum; 296 297 else if (strcmp(name,"TransientRequestedOutputs")==0) return TransientRequestedOutputsEnum; … … 382 383 else if (strcmp(name,"FSpressure")==0) return FSpressureEnum; 383 384 else if (strcmp(name,"Constraints")==0) return ConstraintsEnum; 384 else if (strcmp(name,"Loads")==0) return LoadsEnum;385 385 else stage=4; 386 386 } 387 387 if(stage==4){ 388 if (strcmp(name,"Materials")==0) return MaterialsEnum; 388 if (strcmp(name,"Loads")==0) return LoadsEnum; 389 else if (strcmp(name,"Materials")==0) return MaterialsEnum; 389 390 else if (strcmp(name,"Nodes")==0) return NodesEnum; 390 391 else if (strcmp(name,"Contours")==0) return ContoursEnum; … … 505 506 else if (strcmp(name,"VxPicard")==0) return VxPicardEnum; 506 507 else if (strcmp(name,"VyAverage")==0) return VyAverageEnum; 507 else if (strcmp(name,"Vy")==0) return VyEnum;508 508 else stage=5; 509 509 } 510 510 if(stage==5){ 511 if (strcmp(name,"VyPicard")==0) return VyPicardEnum; 511 if (strcmp(name,"Vy")==0) return VyEnum; 512 else if (strcmp(name,"VyPicard")==0) return VyPicardEnum; 512 513 else if (strcmp(name,"Vz")==0) return VzEnum; 513 514 else if (strcmp(name,"VzSSA")==0) return VzSSAEnum; … … 628 629 else if (strcmp(name,"GaussSeg")==0) return GaussSegEnum; 629 630 else if (strcmp(name,"GaussTria")==0) return GaussTriaEnum; 630 else if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum;631 631 else stage=6; 632 632 } 633 633 if(stage==6){ 634 if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; 634 if (strcmp(name,"GaussTetra")==0) return GaussTetraEnum; 635 else if (strcmp(name,"GaussPenta")==0) return GaussPentaEnum; 635 636 else if (strcmp(name,"FSSolver")==0) return FSSolverEnum; 636 637 else if (strcmp(name,"Adjoint")==0) return AdjointEnum; -
issm/trunk-jpl/src/m/classes/transient.m
r17720 r17734 13 13 isdamageevolution = 0; 14 14 islevelset = 0; 15 ishydrology = 0; 15 16 requested_outputs = {}; 16 17 end … … 40 41 end 41 42 end % }}} 43 function obj = deactivateall(obj) % {{{ 44 45 %full analysis: Stressbalance, Masstransport and Thermal but no groundingline migration for now 46 obj.ismasstransport = 0; 47 obj.isstressbalance = 0; 48 obj.isthermal = 0; 49 obj.isgroundingline = 0; 50 obj.isgia = 0; 51 obj.isdamageevolution = 0; 52 obj.islevelset = 0; 53 obj.ishydrology = 0; 54 55 %default output 56 obj.requested_outputs={'default'}; 57 end % }}} 42 58 function obj = setdefaultparameters(obj) % {{{ 43 59 … … 50 66 obj.isdamageevolution = 0; 51 67 obj.islevelset = 0; 68 obj.ishydrology = 0; 52 69 53 70 %default output … … 73 90 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0 1]); 74 91 md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0 1]); 92 md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0 1]); 75 93 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1); 76 94 … … 86 104 fielddisplay(obj,'isdamageevolution','indicates whether damage evolution is used in the transient'); 87 105 fielddisplay(obj,'islevelset','LEVEL SET DESCRIPTION...'); 106 fielddisplay(obj,'ishydrology','indicates whether an hydrology model is used'); 88 107 fielddisplay(obj,'requested_outputs','list of additional outputs requested'); 89 108 … … 96 115 WriteData(fid,'object',obj,'fieldname','isgia','format','Boolean'); 97 116 WriteData(fid,'object',obj,'fieldname','isdamageevolution','format','Boolean'); 117 WriteData(fid,'object',obj,'fieldname','ishydrology','format','Boolean'); 98 118 WriteData(fid,'object',obj,'fieldname','islevelset','format','Boolean'); 99 119 -
issm/trunk-jpl/src/m/classes/transient.py
r17642 r17734 20 20 self.isdamageevolution = False 21 21 self.islevelset = False 22 self.ishydrology = False 22 23 self.requested_outputs = [] 23 24 … … 35 36 string="%s\n%s"%(string,fielddisplay(self,'isdamageevolution','indicates whether damage evolution is used in the transient')) 36 37 string="%s\n%s"%(string,fielddisplay(self,'islevelset','LEVELSET METHOD DESCRIPTION')) 38 string="%s\n%s"%(string,fielddisplay(self,'ishydrology','indicates whether an hydrology model is used')) 37 39 string="%s\n%s"%(string,fielddisplay(self,'requested_outputs','list of additional outputs requested')) 38 40 return string … … 56 58 self.isdamageevolution = False 57 59 self.islevelset = False 60 self.ishydrology = False 58 61 59 62 #default output … … 74 77 md = checkfield(md,'fieldname','transient.isdamageevolution','numel',[1],'values',[0,1]) 75 78 md = checkfield(md,'fieldname','transient.islevelset','numel',[1],'values',[0,1]) 79 md = checkfield(md,'fieldname','transient.ishydrology','numel',[1],'values',[0,1]) 76 80 md = checkfield(md,'fieldname','transient.requested_outputs','stringrow',1) 77 81 … … 86 90 WriteData(fid,'object',self,'fieldname','isdamageevolution','format','Boolean') 87 91 WriteData(fid,'object',self,'fieldname','islevelset','format','Boolean') 92 WriteData(fid,'object',self,'fieldname','ishydrology','format','Boolean') 88 93 89 94 #process requested outputs -
issm/trunk-jpl/src/m/contrib/paraview/exportVTK.m
r17422 r17734 23 23 24 24 %get the element related variables 25 points=[model.mesh.x model.mesh.y model.mesh.z]; 25 if dimension(model.mesh)==2, 26 points=[model.mesh.x model.mesh.y zeros(model.mesh.numberofvertices,1)]; 27 else 28 points=[model.mesh.x model.mesh.y model.mesh.z]; 29 end 30 26 31 [num_of_points,dim]=size(points); 27 32 [num_of_elt]=size(model.mesh.elements,1); -
issm/trunk-jpl/src/m/enum/EnumDefinitions.py
r17700 r17734 279 279 def TransientIsgiaEnum(): return StringToEnum("TransientIsgia")[0] 280 280 def TransientIsdamageevolutionEnum(): return StringToEnum("TransientIsdamageevolution")[0] 281 def TransientIshydrologyEnum(): return StringToEnum("TransientIshydrology")[0] 281 282 def TransientNumRequestedOutputsEnum(): return StringToEnum("TransientNumRequestedOutputs")[0] 282 283 def TransientRequestedOutputsEnum(): return StringToEnum("TransientRequestedOutputs")[0] -
issm/trunk-jpl/test/NightlyRun/test3300.m
r17524 r17734 2 2 md=setmask(md,'',''); 3 3 md=parameterize(md,'../Par/SquareSheetConstrained.par'); 4 md.transient=deactivateall(md.transient); 5 md.transient.ishydrology=1; 4 6 md=setflowequation(md,'SSA','all'); 5 7 md.cluster=generic('name',oshostname(),'np',1); … … 45 47 md.timestepping.final_time=8.0; 46 48 47 md=solve(md, HydrologySolutionEnum());49 md=solve(md,TransientSolutionEnum()); 48 50 49 51 field_names ={'SedimentWaterHead5','EplWaterHead5','SedimentWaterHead40','EplWaterHead40'}; 50 52 field_tolerances={1e-13, 1e-13, 1e-13, 1e-13, 1e-13}; 51 field_values={md.results. HydrologySolution(5).SedimentHead, ...52 md.results. HydrologySolution(5).EplHead,...53 md.results. HydrologySolution(40).SedimentHead,...54 md.results. HydrologySolution(40).EplHead};53 field_values={md.results.TransientSolution(5).SedimentHead, ... 54 md.results.TransientSolution(5).EplHead,... 55 md.results.TransientSolution(40).SedimentHead,... 56 md.results.TransientSolution(40).EplHead}; -
issm/trunk-jpl/test/NightlyRun/test332.m
r17422 r17734 2 2 md=setmask(md,'',''); 3 3 md=parameterize(md,'../Par/SquareSheetConstrained.par'); 4 md.transient=deactivateall(md.transient); 5 md.transient.ishydrology=1; 4 6 md=setflowequation(md,'SSA','all'); 5 7 md.cluster=generic('name',oshostname(),'np',1); -
issm/trunk-jpl/test/NightlyRun/test333.m
r17524 r17734 2 2 md=setmask(md,'',''); 3 3 md=parameterize(md,'../Par/SquareSheetConstrained.par'); 4 md.transient=deactivateall(md.transient); 5 md.transient.ishydrology=1; 4 6 md=setflowequation(md,'SSA','all'); 5 7 md.cluster=generic('name',oshostname(),'np',1); … … 26 28 %md.verbose.solution=1; 27 29 28 md=solve(md, HydrologySolutionEnum());30 md=solve(md,TransientSolutionEnum()); 29 31 30 32 %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 47 1e-13, 1e-12, 8e-12,... 46 48 1e-13, 2e-12, 1e-11}; 47 field_values={md.results. HydrologySolution(1).SedimentHead, ...48 md.results. HydrologySolution(1).EplHead,...49 md.results. HydrologySolution(1).SedimentHeadResidual,...50 md.results. HydrologySolution(4).SedimentHead,...51 md.results. HydrologySolution(4).EplHead,...52 md.results. HydrologySolution(4).SedimentHeadResidual, ...53 md.results. HydrologySolution(5).SedimentHead,...54 md.results. HydrologySolution(5).EplHead,...55 md.results. HydrologySolution(5).SedimentHeadResidual, ...56 md.results. HydrologySolution(9).SedimentHead,...57 md.results. HydrologySolution(9).EplHead,...58 md.results. HydrologySolution(9).SedimentHeadResidual};49 field_values={md.results.TransientSolution(1).SedimentHead, ... 50 md.results.TransientSolution(1).EplHead,... 51 md.results.TransientSolution(1).SedimentHeadResidual,... 52 md.results.TransientSolution(4).SedimentHead,... 53 md.results.TransientSolution(4).EplHead,... 54 md.results.TransientSolution(4).SedimentHeadResidual, ... 55 md.results.TransientSolution(5).SedimentHead,... 56 md.results.TransientSolution(5).EplHead,... 57 md.results.TransientSolution(5).SedimentHeadResidual, ... 58 md.results.TransientSolution(9).SedimentHead,... 59 md.results.TransientSolution(9).EplHead,... 60 md.results.TransientSolution(9).SedimentHeadResidual}; -
issm/trunk-jpl/test/NightlyRun/test334.m
r17422 r17734 1 1 md=triangle(model(),'../Exp/Square.exp',100000.); 2 2 md=setmask(md,'',''); 3 md.transient=deactivateall(md.transient); 4 md.transient.ishydrology=1; 3 5 md=parameterize(md,'../Par/SquareSheetConstrained.par'); 4 6 md=setflowequation(md,'SSA','all'); -
issm/trunk-jpl/test/NightlyRun/test335.m
r17663 r17734 1 1 md=triangle(model(),'../Exp/Square.exp',100000.); 2 2 md=setmask(md,'',''); 3 md.transient=deactivateall(md.transient); 4 md.transient.ishydrology=1; 3 5 md=parameterize(md,'../Par/SquareSheetConstrained.par'); 4 6 md=setflowequation(md,'SSA','all'); … … 26 28 %md.verbose.solution=1; 27 29 md=extrude(md,3,1.1); 28 md=solve(md, HydrologySolutionEnum());30 md=solve(md,TransientSolutionEnum()); 29 31 30 32 %store=md.constants.g*md.hydrology.sediment_porosity* ... … … 51 53 1e-13, 1e-12, 9e-12,... 52 54 1e-13, 9e-13, 1e-11}; 53 field_values={md.results. HydrologySolution(1).SedimentHead, ...54 md.results. HydrologySolution(1).EplHead,...55 md.results. HydrologySolution(1).SedimentHeadResidual,...56 md.results. HydrologySolution(4).SedimentHead,...57 md.results. HydrologySolution(4).EplHead,...58 md.results. HydrologySolution(4).SedimentHeadResidual, ...59 md.results. HydrologySolution(5).SedimentHead,...60 md.results. HydrologySolution(5).EplHead,...61 md.results. HydrologySolution(5).SedimentHeadResidual, ...62 md.results. HydrologySolution(9).SedimentHead,...63 md.results. HydrologySolution(9).EplHead,...64 md.results. HydrologySolution(9).SedimentHeadResidual};55 field_values={md.results.TransientSolution(1).SedimentHead, ... 56 md.results.TransientSolution(1).EplHead,... 57 md.results.TransientSolution(1).SedimentHeadResidual,... 58 md.results.TransientSolution(4).SedimentHead,... 59 md.results.TransientSolution(4).EplHead,... 60 md.results.TransientSolution(4).SedimentHeadResidual, ... 61 md.results.TransientSolution(5).SedimentHead,... 62 md.results.TransientSolution(5).EplHead,... 63 md.results.TransientSolution(5).SedimentHeadResidual, ... 64 md.results.TransientSolution(9).SedimentHead,... 65 md.results.TransientSolution(9).EplHead,... 66 md.results.TransientSolution(9).SedimentHeadResidual};
Note:
See TracChangeset
for help on using the changeset viewer.
