Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14654) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14655) @@ -95,5 +95,4 @@ HydrologydcSedimentThicknessEnum, HydrologydcSedimentTransmitivityEnum, - HydrologydcWaterDensityEnum, HydrologydcWaterCompressibilityEnum, IndependentObjectEnum, Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14654) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.cpp (revision 14655) @@ -56,5 +56,4 @@ iomodel->Constant(&this->sediment_transmitivity,HydrologydcSedimentTransmitivityEnum); iomodel->Constant(&this->water_compressibility,HydrologydcWaterCompressibilityEnum); - iomodel->Constant(&this->water_density,HydrologydcWaterDensityEnum); } else{ @@ -340,9 +339,4 @@ return water_compressibility; } -/*}}}*/ -/*FUNCTION Matpar::GetWaterDensity {{{*/ -IssmDouble Matpar::GetWaterDensity(){ - return water_density; -} /*}}}*/ /*FUNCTION Matpar::TMeltingPoint {{{*/ Index: /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 14654) +++ /issm/trunk-jpl/src/c/classes/objects/Materials/Matpar.h (revision 14655) @@ -43,5 +43,4 @@ IssmDouble sediment_transmitivity; IssmDouble water_compressibility; - IssmDouble water_density; public: Matpar(); Index: /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14654) +++ /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14655) @@ -100,5 +100,4 @@ case HydrologydcSedimentThicknessEnum : return "HydrologydcSedimentThickness"; case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity"; - case HydrologydcWaterDensityEnum : return "HydrologydcWaterDensity"; case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility"; case IndependentObjectEnum : return "IndependentObject"; Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14654) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14655) @@ -101,5 +101,4 @@ else if (strcmp(name,"HydrologydcSedimentThickness")==0) return HydrologydcSedimentThicknessEnum; else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum; - else if (strcmp(name,"HydrologydcWaterDensity")==0) return HydrologydcWaterDensityEnum; else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum; else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; @@ -138,9 +137,9 @@ else if (strcmp(name,"MaterialsRheologyB")==0) return MaterialsRheologyBEnum; else if (strcmp(name,"MaterialsRheologyBbar")==0) return MaterialsRheologyBbarEnum; + else if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; else stage=2; } if(stage==2){ - if (strcmp(name,"MaterialsRheologyLaw")==0) return MaterialsRheologyLawEnum; - else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; + if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum; else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum; @@ -261,9 +260,9 @@ else if (strcmp(name,"DiagnosticSolution")==0) return DiagnosticSolutionEnum; else if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; + else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; else stage=3; } if(stage==3){ - if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; - else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; + if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; @@ -384,9 +383,9 @@ else if (strcmp(name,"Misfit")==0) return MisfitEnum; else if (strcmp(name,"NumberNodeToElementConnectivity")==0) return NumberNodeToElementConnectivityEnum; + else if (strcmp(name,"Pressure")==0) return PressureEnum; else stage=4; } if(stage==4){ - if (strcmp(name,"Pressure")==0) return PressureEnum; - else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; + if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; @@ -507,9 +506,9 @@ else if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; else if (strcmp(name,"Gset")==0) return GsetEnum; + else if (strcmp(name,"Index")==0) return IndexEnum; else stage=5; } if(stage==5){ - if (strcmp(name,"Index")==0) return IndexEnum; - else if (strcmp(name,"Indexed")==0) return IndexedEnum; + if (strcmp(name,"Indexed")==0) return IndexedEnum; else if (strcmp(name,"Intersect")==0) return IntersectEnum; else if (strcmp(name,"Nodal")==0) return NodalEnum; Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 14654) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 14655) @@ -6,67 +6,62 @@ classdef hydrologydc properties (SetAccess=public) - spcsediment_head = NaN; - sediment_compressibility = 0; - sediment_porosity = 0; - sediment_thickness = 0; - sediment_transmitivity = 0; - water_compressibility = 0; - water_density = 0; - end - methods - function obj = hydrologydc(varargin) % {{{ - switch nargin - case 0 - obj=setdefaultparameters(obj); - otherwise - error('constructor not supported'); - end - end % }}} - function obj = setdefaultparameters(obj) % {{{ + spcsediment_head = NaN; + sediment_compressibility = 0; + sediment_porosity = 0; + sediment_thickness = 0; + sediment_transmitivity = 0; + water_compressibility = 0; + end + methods + function obj = hydrologydc(varargin) % {{{ + switch nargin + case 0 + obj=setdefaultparameters(obj); + otherwise + error('constructor not supported'); + end + end % }}} + function obj = setdefaultparameters(obj) % {{{ - %Parameters from de Fleurian 2013 - obj.sediment_compressibility = 1.0e-08; - obj.sediment_porosity = .4; - obj.sediment_thickness = 20.0; - obj.sediment_transmitivity = 8.0e-04; - obj.water_compressibility = 5.04e-10; - obj.water_density = 1.0e+03; + %Parameters from de Fleurian 2013 + obj.sediment_compressibility = 1.0e-08; + obj.sediment_porosity = .4; + obj.sediment_thickness = 20.0; + obj.sediment_transmitivity = 8.0e-04; + obj.water_compressibility = 5.04e-10; + + end % }}} + function md = checkconsistency(obj,md,solution,analyses) % {{{ + + %Early return + if ~ismember(HydrologyAnalysisEnum(),analyses), return; end + + md = checkfield(md,'hydrology.spcsediment_head','forcing',1); + md = checkfield(md,'hydrology.sediment_compressibility','>',0,'numel',1); + md = checkfield(md,'hydrology.sediment_porosity','>',0,'numel',1); + md = checkfield(md,'hydrology.sediment_thickness','>',0,'numel',1); + md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1); + md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1); + end % }}} + function disp(obj) % {{{ + disp(sprintf(' hydrology Dual Porous Continuum Equivalent parameters:')); - end % }}} - function md = checkconsistency(obj,md,solution,analyses) % {{{ - - %Early return - if ~ismember(HydrologyAnalysisEnum(),analyses), return; end - - md = checkfield(md,'hydrology.spcsediment_head','forcing',1); - md = checkfield(md,'hydrology.sediment_compressibility','>',0,'numel',1); - md = checkfield(md,'hydrology.sediment_porosity','>',0,'numel',1); - md = checkfield(md,'hydrology.sediment_thickness','>',0,'numel',1); - md = checkfield(md,'hydrology.sediment_transmitivity','>',0,'numel',1); - md = checkfield(md,'hydrology.water_compressibility','>',0,'numel',1); - md = checkfield(md,'hydrology.water_density','>',0,'numel',1); - end % }}} - function disp(obj) % {{{ - disp(sprintf(' hydrology Dual Porous Continuum Equivalent parameters:')); - - fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint) [m above MSL]'); - fielddisplay(obj,'sediment_compressibility','sediment compressibility [Pa^-1]'); - fielddisplay(obj,'sediment_porosity','sediment [dimensionless]'); - fielddisplay(obj,'sediment_thickness','sediment thickness [m]'); - fielddisplay(obj,'sediment_transmitivity','sediment transmitivity [m^2/s]'); - fielddisplay(obj,'water_compressibility','water compressibility [Pa^-1]'); - fielddisplay(obj,'water_density','water density [kg/m^3]'); - - end % }}} - function marshall(obj,fid) % {{{ - WriteData(fid,'enum',HydrologyEnum(),'data',HydrologydcEnum(),'format','Integer'); - WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1); - WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double'); - WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double'); - WriteData(fid,'object',obj,'fieldname','sediment_thickness','format','Double'); - WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','Double'); - WriteData(fid,'object',obj,'fieldname','water_compressibility','format','Double'); - WriteData(fid,'object',obj,'fieldname','water_density','format','Double'); - end % }}} - end + fielddisplay(obj,'spcsediment_head','sediment water head constraints (NaN means no constraint) [m above MSL]'); + fielddisplay(obj,'sediment_compressibility','sediment compressibility [Pa^-1]'); + fielddisplay(obj,'sediment_porosity','sediment [dimensionless]'); + fielddisplay(obj,'sediment_thickness','sediment thickness [m]'); + fielddisplay(obj,'sediment_transmitivity','sediment transmitivity [m^2/s]'); + fielddisplay(obj,'water_compressibility','water compressibility [Pa^-1]'); + + end % }}} + function marshall(obj,fid) % {{{ + WriteData(fid,'enum',HydrologyEnum(),'data',HydrologydcEnum(),'format','Integer'); + WriteData(fid,'object',obj,'fieldname','spcsediment_head','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'fieldname','sediment_compressibility','format','Double'); + WriteData(fid,'object',obj,'fieldname','sediment_porosity','format','Double'); + WriteData(fid,'object',obj,'fieldname','sediment_thickness','format','Double'); + WriteData(fid,'object',obj,'fieldname','sediment_transmitivity','format','Double'); + WriteData(fid,'object',obj,'fieldname','water_compressibility','format','Double'); + end % }}} + end end Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 14654) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 14655) @@ -839,14 +839,4 @@ return StringToEnum('HydrologydcSedimentTransmitivity')[0] -def HydrologydcWaterDensityEnum(): - """ - HYDROLOGYDCWATERDENSITYENUM - Enum of HydrologydcWaterDensity - - Usage: - macro=HydrologydcWaterDensityEnum() - """ - - return StringToEnum('HydrologydcWaterDensity')[0] - def HydrologydcWaterCompressibilityEnum(): """ @@ -5137,4 +5127,4 @@ """ - return 512 - + return 511 + Index: sm/trunk-jpl/src/m/enum/HydrologydcWaterDensityEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcWaterDensityEnum.m (revision 14654) +++ (revision ) @@ -1,11 +1,0 @@ -function macro=HydrologydcWaterDensityEnum() -%HYDROLOGYDCWATERDENSITYENUM - Enum of HydrologydcWaterDensity -% -% WARNING: DO NOT MODIFY THIS FILE -% this file has been automatically generated by src/c/EnumDefinitions/Synchronize.sh -% Please read src/c/EnumDefinitions/README for more information -% -% Usage: -% macro=HydrologydcWaterDensityEnum() - -macro=StringToEnum('HydrologydcWaterDensity'); Index: /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 14654) +++ /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 14655) @@ -9,3 +9,3 @@ % macro=MaximumNumberOfEnums() -macro=512; +macro=511;