Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14743) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14744) @@ -96,4 +96,10 @@ HydrologydcSedimentTransmitivityEnum, HydrologydcWaterCompressibilityEnum, + HydrologydcSpceplHeadEnum, + HydrologydcEplCompressibilityEnum, + HydrologydcEplPorosityEnum, + HydrologydcEplThicknessEnum, + HydrologydcEplTransmitivityEnum, + HydrologydcIsefficientlayerEnum, IndependentObjectEnum, InversionControlParametersEnum, Index: /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14743) +++ /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14744) @@ -101,4 +101,10 @@ case HydrologydcSedimentTransmitivityEnum : return "HydrologydcSedimentTransmitivity"; case HydrologydcWaterCompressibilityEnum : return "HydrologydcWaterCompressibility"; + case HydrologydcSpceplHeadEnum : return "HydrologydcSpceplHead"; + case HydrologydcEplCompressibilityEnum : return "HydrologydcEplCompressibility"; + case HydrologydcEplPorosityEnum : return "HydrologydcEplPorosity"; + case HydrologydcEplThicknessEnum : return "HydrologydcEplThickness"; + case HydrologydcEplTransmitivityEnum : return "HydrologydcEplTransmitivity"; + case HydrologydcIsefficientlayerEnum : return "HydrologydcIsefficientlayer"; case IndependentObjectEnum : return "IndependentObject"; case InversionControlParametersEnum : return "InversionControlParameters"; Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14743) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14744) @@ -102,4 +102,10 @@ else if (strcmp(name,"HydrologydcSedimentTransmitivity")==0) return HydrologydcSedimentTransmitivityEnum; else if (strcmp(name,"HydrologydcWaterCompressibility")==0) return HydrologydcWaterCompressibilityEnum; + else if (strcmp(name,"HydrologydcSpceplHead")==0) return HydrologydcSpceplHeadEnum; + else if (strcmp(name,"HydrologydcEplCompressibility")==0) return HydrologydcEplCompressibilityEnum; + else if (strcmp(name,"HydrologydcEplPorosity")==0) return HydrologydcEplPorosityEnum; + else if (strcmp(name,"HydrologydcEplThickness")==0) return HydrologydcEplThicknessEnum; + else if (strcmp(name,"HydrologydcEplTransmitivity")==0) return HydrologydcEplTransmitivityEnum; + else if (strcmp(name,"HydrologydcIsefficientlayer")==0) return HydrologydcIsefficientlayerEnum; else if (strcmp(name,"IndependentObject")==0) return IndependentObjectEnum; else if (strcmp(name,"InversionControlParameters")==0) return InversionControlParametersEnum; @@ -132,5 +138,8 @@ else if (strcmp(name,"MaterialsBeta")==0) return MaterialsBetaEnum; else if (strcmp(name,"MaterialsHeatcapacity")==0) return MaterialsHeatcapacityEnum; - else if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; + else stage=2; + } + if(stage==2){ + if (strcmp(name,"MaterialsLatentheat")==0) return MaterialsLatentheatEnum; else if (strcmp(name,"MaterialsMeltingpoint")==0) return MaterialsMeltingpointEnum; else if (strcmp(name,"MaterialsMixedLayerCapacity")==0) return MaterialsMixedLayerCapacityEnum; @@ -138,8 +147,5 @@ 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,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; + else if (strcmp(name,"MaterialsRheologyN")==0) return MaterialsRheologyNEnum; else if (strcmp(name,"MaterialsRheologyZ")==0) return MaterialsRheologyZEnum; else if (strcmp(name,"MaterialsRheologyZbar")==0) return MaterialsRheologyZbarEnum; @@ -255,5 +261,8 @@ else if (strcmp(name,"AdjointHorizAnalysis")==0) return AdjointHorizAnalysisEnum; else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; - else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; + else stage=3; + } + if(stage==3){ + if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum; @@ -261,8 +270,5 @@ else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; else if (strcmp(name,"WeakBalancethicknessAnalysis")==0) return WeakBalancethicknessAnalysisEnum; - else stage=3; - } - if(stage==3){ - if (strcmp(name,"WeakBalancethicknessSolution")==0) return WeakBalancethicknessSolutionEnum; + else if (strcmp(name,"WeakBalancethicknessSolution")==0) return WeakBalancethicknessSolutionEnum; else if (strcmp(name,"BedSlopeAnalysis")==0) return BedSlopeAnalysisEnum; else if (strcmp(name,"BedSlopeSolution")==0) return BedSlopeSolutionEnum; @@ -378,5 +384,8 @@ else if (strcmp(name,"Adjointz")==0) return AdjointzEnum; else if (strcmp(name,"BalancethicknessMisfit")==0) return BalancethicknessMisfitEnum; - else if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"BedSlopeX")==0) return BedSlopeXEnum; else if (strcmp(name,"BedSlopeY")==0) return BedSlopeYEnum; else if (strcmp(name,"Boundary")==0) return BoundaryEnum; @@ -384,8 +393,5 @@ else if (strcmp(name,"Converged")==0) return ConvergedEnum; else if (strcmp(name,"ExtToIu")==0) return ExtToIuEnum; - else stage=4; - } - if(stage==4){ - if (strcmp(name,"Fill")==0) return FillEnum; + else if (strcmp(name,"Fill")==0) return FillEnum; else if (strcmp(name,"FractionIncrement")==0) return FractionIncrementEnum; else if (strcmp(name,"Friction")==0) return FrictionEnum; @@ -501,5 +507,8 @@ else if (strcmp(name,"Incremental")==0) return IncrementalEnum; else if (strcmp(name,"AgressiveMigration")==0) return AgressiveMigrationEnum; - else if (strcmp(name,"None")==0) return NoneEnum; + else stage=5; + } + if(stage==5){ + if (strcmp(name,"None")==0) return NoneEnum; else if (strcmp(name,"SoftMigration")==0) return SoftMigrationEnum; else if (strcmp(name,"SubelementMigration")==0) return SubelementMigrationEnum; @@ -507,8 +516,5 @@ else if (strcmp(name,"GLlevelset")==0) return GLlevelsetEnum; else if (strcmp(name,"StokesSolver")==0) return StokesSolverEnum; - else stage=5; - } - if(stage==5){ - if (strcmp(name,"Adjoint")==0) return AdjointEnum; + else if (strcmp(name,"Adjoint")==0) return AdjointEnum; else if (strcmp(name,"Colinear")==0) return ColinearEnum; else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum; Index: /issm/trunk-jpl/src/m/classes/hydrologydc.m =================================================================== --- /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 14743) +++ /issm/trunk-jpl/src/m/classes/hydrologydc.m (revision 14744) @@ -6,62 +6,103 @@ classdef hydrologydc properties (SetAccess=public) - 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) % {{{ + spcsediment_head = NaN; + sediment_compressibility = 0; + sediment_porosity = 0; + sediment_thickness = 0; + sediment_transmitivity = 0; + water_compressibility = 0; + + spcepl_head = NaN; + epl_compressibility = 0; + epl_porosity = 0; + epl_thickness = 0; + epl_transmitivity = 0; + isefficientlayer = 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.epl_compressibility = 1.0e-08; + obj.epl_porosity = 0.4; + obj.epl_thickness = 1.0; + obj.epl_transmitivity = 8.0e-02; + obj.isefficientlayer = 1; + + 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.spcepl_head','forcing',1); + md = checkfield(md,'hydrology.epl_compressibility','>',0,'numel',1); + md = checkfield(md,'hydrology.epl_porosity','>',0,'numel',1); + md = checkfield(md,'hydrology.epl_thickness','>',0,'numel',1); + md = checkfield(md,'hydrology.epl_transmitivity','>',0,'numel',1); + md = checkfield(md,'hydrology.isefficientlayer','numel',[1],'values',[0 1]); + + end % }}} + function disp(obj) % {{{ + disp(sprintf(' hydrology Dual Porous Continuum Equivalent parameters:')); + disp(sprintf(' - for the sediment layer')); + + 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]'); - %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:')); - - 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 + if isefficientlayer==1, + disp(sprintf(' - for the epl layer')); + + fielddisplay(obj,'spcepl_head','epl water head constraints (NaN means no constraint) [m above MSL]'); + fielddisplay(obj,'epl_compressibility','epl compressibility [Pa^-1]'); + fielddisplay(obj,'epl_porosity','epl [dimensionless]'); + fielddisplay(obj,'epl_thickness','epl thickness [m]'); + fielddisplay(obj,'epl_transmitivity','epl transmitivity [m^2/s]'); + end + + 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','spcepl_head','format','DoubleMat','mattype',1); + WriteData(fid,'object',obj,'fieldname','epl_compressibility','format','Double'); + WriteData(fid,'object',obj,'fieldname','epl_porosity','format','Double'); + WriteData(fid,'object',obj,'fieldname','epl_thickness','format','Double'); + WriteData(fid,'object',obj,'fieldname','epl_transmitivity','format','Double'); + WriteData(fid,'object',obj,'fieldname','isefficientlayer','format','Boolean'); + + end % }}} + end end Index: /issm/trunk-jpl/src/m/enum/EnumDefinitions.py =================================================================== --- /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 14743) +++ /issm/trunk-jpl/src/m/enum/EnumDefinitions.py (revision 14744) @@ -849,4 +849,64 @@ return StringToEnum('HydrologydcWaterCompressibility')[0] +def HydrologydcSpceplHeadEnum(): + """ + HYDROLOGYDCSPCEPLHEADENUM - Enum of HydrologydcSpceplHead + + Usage: + macro=HydrologydcSpceplHeadEnum() + """ + + return StringToEnum('HydrologydcSpceplHead')[0] + +def HydrologydcEplCompressibilityEnum(): + """ + HYDROLOGYDCEPLCOMPRESSIBILITYENUM - Enum of HydrologydcEplCompressibility + + Usage: + macro=HydrologydcEplCompressibilityEnum() + """ + + return StringToEnum('HydrologydcEplCompressibility')[0] + +def HydrologydcEplPorosityEnum(): + """ + HYDROLOGYDCEPLPOROSITYENUM - Enum of HydrologydcEplPorosity + + Usage: + macro=HydrologydcEplPorosityEnum() + """ + + return StringToEnum('HydrologydcEplPorosity')[0] + +def HydrologydcEplThicknessEnum(): + """ + HYDROLOGYDCEPLTHICKNESSENUM - Enum of HydrologydcEplThickness + + Usage: + macro=HydrologydcEplThicknessEnum() + """ + + return StringToEnum('HydrologydcEplThickness')[0] + +def HydrologydcEplTransmitivityEnum(): + """ + HYDROLOGYDCEPLTRANSMITIVITYENUM - Enum of HydrologydcEplTransmitivity + + Usage: + macro=HydrologydcEplTransmitivityEnum() + """ + + return StringToEnum('HydrologydcEplTransmitivity')[0] + +def HydrologydcIsefficientlayerEnum(): + """ + HYDROLOGYDCISEFFICIENTLAYERENUM - Enum of HydrologydcIsefficientlayer + + Usage: + macro=HydrologydcIsefficientlayerEnum() + """ + + return StringToEnum('HydrologydcIsefficientlayer')[0] + def IndependentObjectEnum(): """ @@ -5277,4 +5337,4 @@ """ - return 526 - + return 532 + Index: /issm/trunk-jpl/src/m/enum/HydrologydcEplCompressibilityEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcEplCompressibilityEnum.m (revision 14744) +++ /issm/trunk-jpl/src/m/enum/HydrologydcEplCompressibilityEnum.m (revision 14744) @@ -0,0 +1,11 @@ +function macro=HydrologydcEplCompressibilityEnum() +%HYDROLOGYDCEPLCOMPRESSIBILITYENUM - Enum of HydrologydcEplCompressibility +% +% 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=HydrologydcEplCompressibilityEnum() + +macro=StringToEnum('HydrologydcEplCompressibility'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcEplPorosityEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcEplPorosityEnum.m (revision 14744) +++ /issm/trunk-jpl/src/m/enum/HydrologydcEplPorosityEnum.m (revision 14744) @@ -0,0 +1,11 @@ +function macro=HydrologydcEplPorosityEnum() +%HYDROLOGYDCEPLPOROSITYENUM - Enum of HydrologydcEplPorosity +% +% 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=HydrologydcEplPorosityEnum() + +macro=StringToEnum('HydrologydcEplPorosity'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcEplThicknessEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcEplThicknessEnum.m (revision 14744) +++ /issm/trunk-jpl/src/m/enum/HydrologydcEplThicknessEnum.m (revision 14744) @@ -0,0 +1,11 @@ +function macro=HydrologydcEplThicknessEnum() +%HYDROLOGYDCEPLTHICKNESSENUM - Enum of HydrologydcEplThickness +% +% 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=HydrologydcEplThicknessEnum() + +macro=StringToEnum('HydrologydcEplThickness'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcEplTransmitivityEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcEplTransmitivityEnum.m (revision 14744) +++ /issm/trunk-jpl/src/m/enum/HydrologydcEplTransmitivityEnum.m (revision 14744) @@ -0,0 +1,11 @@ +function macro=HydrologydcEplTransmitivityEnum() +%HYDROLOGYDCEPLTRANSMITIVITYENUM - Enum of HydrologydcEplTransmitivity +% +% 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=HydrologydcEplTransmitivityEnum() + +macro=StringToEnum('HydrologydcEplTransmitivity'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcIsefficientlayerEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcIsefficientlayerEnum.m (revision 14744) +++ /issm/trunk-jpl/src/m/enum/HydrologydcIsefficientlayerEnum.m (revision 14744) @@ -0,0 +1,11 @@ +function macro=HydrologydcIsefficientlayerEnum() +%HYDROLOGYDCISEFFICIENTLAYERENUM - Enum of HydrologydcIsefficientlayer +% +% 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=HydrologydcIsefficientlayerEnum() + +macro=StringToEnum('HydrologydcIsefficientlayer'); Index: /issm/trunk-jpl/src/m/enum/HydrologydcSpceplHeadEnum.m =================================================================== --- /issm/trunk-jpl/src/m/enum/HydrologydcSpceplHeadEnum.m (revision 14744) +++ /issm/trunk-jpl/src/m/enum/HydrologydcSpceplHeadEnum.m (revision 14744) @@ -0,0 +1,11 @@ +function macro=HydrologydcSpceplHeadEnum() +%HYDROLOGYDCSPCEPLHEADENUM - Enum of HydrologydcSpceplHead +% +% 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=HydrologydcSpceplHeadEnum() + +macro=StringToEnum('HydrologydcSpceplHead'); Index: /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m =================================================================== --- /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 14743) +++ /issm/trunk-jpl/src/m/enum/MaximumNumberOfEnums.m (revision 14744) @@ -9,3 +9,3 @@ % macro=MaximumNumberOfEnums() -macro=526; +macro=532;