Changeset 7646

Timestamp:

03/15/11 09:05:19 (14 years ago)

Author:

Eric.Larour

Message:

hydrology related stuff

Location:

issm/trunk/src/m/model

Files:

• marshall.m (modified) (3 diffs)
• process_solve_options.m (modified) (1 diff)
• tres.m (modified) (1 diff)

issm/trunk/src/m/model/marshall.m

@@ -82 +82 @@
 WriteData(fid,md.spctemperature,'Mat','spctemperature');
 WriteData(fid,md.spcthickness,'Mat','spcthickness');
+WriteData(fid,md.spcwatercolumn,'Mat','spcwatercolumn');
 
 WriteData(fid,md.pressureload,'Mat','pressureload');
@@ -95 +96 @@
 end
 WriteData(fid,md.dhdt,'Mat','dhdt');
+WriteData(fid,md.watercolumn,'Mat','watercolumn');
 
 %Get materials
@@ -151 +153 @@
 %Thermal parameters
 WriteData(fid,md.beta,'Scalar','beta');
+WriteData(fid,md.hydro_gamma,'Scalar','gamma'); 
+WriteData(fid,md.hydro_kn,'Scalar','kn');
 WriteData(fid,md.meltingpoint,'Scalar','meltingpoint');
 WriteData(fid,md.latentheat,'Scalar','latentheat');

issm/trunk/src/m/model/process_solve_options.m

@@ -22 +22 @@
 if ~ismember(solution_type,[DiagnosticSolutionEnum,PrognosticSolutionEnum,ThermalSolutionEnum,...
                 SteadystateSolutionEnum,ParametersSolutionEnum,Transient2DSolutionEnum,Transient3DSolutionEnum...
-                BalancedthicknessSolutionEnum,BalancedvelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum]),
+                BalancedthicknessSolutionEnum,BalancedvelocitiesSolutionEnum,BedSlopeSolutionEnum,SurfaceSlopeSolutionEnum,GroundingLineMigration2DSolutionEnum,HydrologySolutionEnum]),
         error(['process_solve_options error message: solution_type ' EnumToString(solution_type) ' not supported yet!']);
 end

issm/trunk/src/m/model/tres.m

@@ -90 +90 @@
         md.temperature=PatchToVec(md.results.ThermalSolution.Temperature);
         md.melting_rate=PatchToVec(md.results.ThermalSolution.MeltingRate);
+elseif strcmpi(string,'hydrology'),
+        md.watercolumn=PatchToVec(md.results.HydrologySolution.WaterColumn);
+
 else 
         error(['tres error message: analysis ' string ' not supported yet!']);