Index: /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/BalancethicknessAnalysis.cpp (revision 20645) @@ -10,5 +10,5 @@ /*Fetch parameters: */ int stabilization; - iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum); + iomodel->FindConstant(&stabilization,BalancethicknessStabilizationEnum); /*Do not add constraints in DG*/ @@ -25,5 +25,5 @@ /*Fetch parameters: */ - iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum); + iomodel->FindConstant(&stabilization,BalancethicknessStabilizationEnum); /*Loads only in DG*/ @@ -54,5 +54,5 @@ int stabilization; - iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum); + iomodel->FindConstant(&stabilization,BalancethicknessStabilizationEnum); /*Check in 3d*/ @@ -77,5 +77,5 @@ /*Fetch data needed: */ - iomodel->Constant(&stabilization,BalancethicknessStabilizationEnum); + iomodel->FindConstant(&stabilization,BalancethicknessStabilizationEnum); /*Finite element type*/ Index: /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/DamageEvolutionAnalysis.cpp (revision 20645) @@ -9,9 +9,9 @@ int finiteelement; - iomodel->Constant(&finiteelement,DamageElementinterpEnum); + iomodel->FindConstant(&finiteelement,DamageElementinterpEnum); /*Fetch parameters: */ int stabilization; - iomodel->Constant(&stabilization,DamageStabilizationEnum); + iomodel->FindConstant(&stabilization,DamageStabilizationEnum); /*Do not add constraints in DG, they are weakly imposed*/ @@ -34,5 +34,5 @@ int finiteelement; - iomodel->Constant(&finiteelement,DamageElementinterpEnum); + iomodel->FindConstant(&finiteelement,DamageElementinterpEnum); ::CreateNodes(nodes,iomodel,DamageEvolutionAnalysisEnum,finiteelement); }/*}}}*/ @@ -45,6 +45,6 @@ bool ismovingfront; - iomodel->Constant(&finiteelement,DamageElementinterpEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&finiteelement,DamageElementinterpEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); /*Update elements: */ @@ -88,5 +88,5 @@ /*Retrieve law dependent parameters: */ int law; - iomodel->Constant(&law,DamageLawEnum); + iomodel->FindConstant(&law,DamageLawEnum); if (law==0){ parameters->AddObject(iomodel->CopyConstantObject(DamageStressThresholdEnum)); Index: /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/EnthalpyAnalysis.cpp (revision 20645) @@ -22,6 +22,6 @@ /*Fetch parameters: */ - iomodel->Constant(&heatcapacity,MaterialsHeatcapacityEnum); - iomodel->Constant(&referencetemperature,ConstantsReferencetemperatureEnum); + iomodel->FindConstant(&heatcapacity,MaterialsHeatcapacityEnum); + iomodel->FindConstant(&referencetemperature,ConstantsReferencetemperatureEnum); /*return if 2d mesh*/ @@ -115,5 +115,5 @@ /*Is enthalpy requested?*/ - iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); + iomodel->FindConstant(&isenthalpy,ThermalIsenthalpyEnum); if(!isenthalpy) return; @@ -131,7 +131,7 @@ } - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); iomodel->FetchDataToInput(elements,ThicknessEnum); @@ -164,5 +164,5 @@ /*Basal forcings variables*/ - iomodel->Constant(&basalforcing_model,BasalforcingsEnum); + iomodel->FindConstant(&basalforcing_model,BasalforcingsEnum); switch(basalforcing_model){ case MantlePlumeGeothermalFluxEnum: @@ -185,5 +185,5 @@ break; case 3: - iomodel->Constant(&FrictionCoupling,FrictionCouplingEnum); + iomodel->FindConstant(&FrictionCoupling,FrictionCouplingEnum); iomodel->FetchDataToInput(elements,FrictionCEnum); iomodel->FetchDataToInput(elements,FrictionAsEnum); @@ -237,5 +237,5 @@ /*Deal with friction parameters*/ int frictionlaw; - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum)); if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject(FrictionCouplingEnum)); Index: /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/FreeSurfaceTopAnalysis.cpp (revision 20645) @@ -67,5 +67,5 @@ /*Fetch data needed: */ - iomodel->Constant(&smb_model,SmbEnum); + iomodel->FindConstant(&smb_model,SmbEnum); /*Update elements: */ Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCEfficientAnalysis.cpp (revision 20645) @@ -16,5 +16,5 @@ bool isefficientlayer; /*retrieve some parameters: */ - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want DC?*/ @@ -22,5 +22,5 @@ /*Do we want an efficient layer*/ - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); /*If not return*/ @@ -42,9 +42,9 @@ /*Now, do we really want DC?*/ - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; /*Do we want an efficient layer*/ - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); if(!isefficientlayer) return; @@ -76,10 +76,10 @@ /*Now, do we really want DC?*/ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; /*Do we want an efficient layer*/ bool isefficientlayer; - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); if(!isefficientlayer) return; @@ -93,10 +93,10 @@ /*Do we really want DC?*/ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; /*Do we want an efficient layer*/ bool isefficientlayer; - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); if(!isefficientlayer) return; Index: /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/HydrologyDCInefficientAnalysis.cpp (revision 20645) @@ -25,5 +25,5 @@ /*retrieve some parameters: */ - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want DC?*/ @@ -65,5 +65,5 @@ /*Fetch data needed: */ - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want DC?*/ @@ -71,5 +71,5 @@ /*Fetch data needed: */ - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); /*Update elements: */ @@ -104,5 +104,5 @@ /*Fetch parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want DC?*/ @@ -118,5 +118,5 @@ /*retrieve some parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; @@ -128,5 +128,5 @@ /*Fetch parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; Index: /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/HydrologyShreveAnalysis.cpp (revision 20645) @@ -10,5 +10,5 @@ /*retrieve some parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologyshreveEnum) return; @@ -24,5 +24,5 @@ /*Fetch parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Shreve?*/ @@ -40,5 +40,5 @@ /*Fetch data needed: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Shreve?*/ @@ -74,5 +74,5 @@ /*retrieve some parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Shreve?*/ Index: /issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/HydrologySommersAnalysis.cpp (revision 20645) @@ -14,5 +14,5 @@ /*retrieve some parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologysommersEnum) return; @@ -25,5 +25,5 @@ /*Fetch parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Sommers?*/ @@ -67,5 +67,5 @@ /*Fetch parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Sommers?*/ @@ -83,5 +83,5 @@ /*Fetch data needed: */ int hydrology_model,frictionlaw; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Sommers?*/ @@ -119,5 +119,5 @@ iomodel->FetchDataToInput(elements,VyEnum); - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); /*Friction law variables*/ switch(frictionlaw){ @@ -138,5 +138,5 @@ /*retrieve some parameters: */ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); /*Now, do we really want Sommers?*/ Index: /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/L2ProjectionEPLAnalysis.cpp (revision 20645) @@ -17,10 +17,10 @@ /*Now, do we really want DC?*/ int hydrology_model; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; /*Do we want an efficient layer*/ bool isefficientlayer; - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); if(!isefficientlayer) return; @@ -43,9 +43,9 @@ /*Now, do we really want DC?*/ - iomodel->Constant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); if(hydrology_model!=HydrologydcEnum) return; /*Do we want an efficient layer*/ - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); if(!isefficientlayer) return; Index: /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/LevelsetAnalysis.cpp (revision 20645) @@ -50,5 +50,5 @@ /*Get moving front parameters*/ int calvinglaw; - iomodel->Constant(&calvinglaw,CalvingLawEnum); + iomodel->FindConstant(&calvinglaw,CalvingLawEnum); switch(calvinglaw){ case DefaultCalvingEnum: Index: /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/MasstransportAnalysis.cpp (revision 20645) @@ -10,5 +10,5 @@ /*Fetch parameters: */ int stabilization; - iomodel->Constant(&stabilization,MasstransportStabilizationEnum); + iomodel->FindConstant(&stabilization,MasstransportStabilizationEnum); /*Do not add constraints in DG, they are weakly imposed*/ @@ -32,5 +32,5 @@ /*Fetch parameters: */ - iomodel->Constant(&stabilization,MasstransportStabilizationEnum); + iomodel->FindConstant(&stabilization,MasstransportStabilizationEnum); /*Loads only in DG*/ @@ -98,5 +98,5 @@ /*Fetch parameters: */ int stabilization; - iomodel->Constant(&stabilization,MasstransportStabilizationEnum); + iomodel->FindConstant(&stabilization,MasstransportStabilizationEnum); /*Check in 3d*/ @@ -124,8 +124,8 @@ /*Fetch data needed: */ - iomodel->Constant(&stabilization,MasstransportStabilizationEnum); - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&stabilization,MasstransportStabilizationEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&isgroundingline,TransientIsgroundinglineEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); /*Finite element type*/ Index: /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/SmbAnalysis.cpp (revision 20645) @@ -34,5 +34,5 @@ /*Figure out smb model: */ - iomodel->Constant(&smb_model,SmbEnum); + iomodel->FindConstant(&smb_model,SmbEnum); @@ -61,6 +61,6 @@ break; case SMBpddEnum: - iomodel->Constant(&isdelta18o,SmbIsdelta18oEnum); - iomodel->Constant(&ismungsm,SmbIsmungsmEnum); + iomodel->FindConstant(&isdelta18o,SmbIsdelta18oEnum); + iomodel->FindConstant(&ismungsm,SmbIsmungsmEnum); iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); iomodel->FetchDataToInput(elements,SmbS0pEnum); @@ -78,6 +78,6 @@ break; case SMBd18opddEnum: - iomodel->Constant(&ismungsm,SmbIsmungsmEnum); - iomodel->Constant(&isd18opd,SmbIsd18opdEnum); + iomodel->FindConstant(&ismungsm,SmbIsmungsmEnum); + iomodel->FindConstant(&isd18opd,SmbIsd18opdEnum); iomodel->FetchDataToInput(elements,ThermalSpctemperatureEnum); iomodel->FetchDataToInput(elements,SmbS0pEnum); @@ -127,6 +127,6 @@ parameters->AddObject(iomodel->CopyConstantObject(SmbEnum)); - iomodel->Constant(&smb_model,SmbEnum); - iomodel->Constant(&interp,TimesteppingInterpForcingsEnum); + iomodel->FindConstant(&smb_model,SmbEnum); + iomodel->FindConstant(&interp,TimesteppingInterpForcingsEnum); switch(smb_model){ @@ -162,6 +162,6 @@ parameters->AddObject(iomodel->CopyConstantObject(SmbRlapsEnum)); parameters->AddObject(iomodel->CopyConstantObject(SmbRlapslgmEnum)); - iomodel->Constant(&isdelta18o,SmbIsdelta18oEnum); - iomodel->Constant(&ismungsm,SmbIsmungsmEnum); + iomodel->FindConstant(&isdelta18o,SmbIsdelta18oEnum); + iomodel->FindConstant(&ismungsm,SmbIsmungsmEnum); if(ismungsm){ @@ -194,6 +194,6 @@ parameters->AddObject(iomodel->CopyConstantObject(SmbRlapsEnum)); parameters->AddObject(iomodel->CopyConstantObject(SmbRlapslgmEnum)); - iomodel->Constant(&ismungsm,SmbIsmungsmEnum); - iomodel->Constant(&isd18opd,SmbIsd18opdEnum); + iomodel->FindConstant(&ismungsm,SmbIsmungsmEnum); + iomodel->FindConstant(&isd18opd,SmbIsd18opdEnum); if(isd18opd){ iomodel->FetchData(&temp,&N,&M,SmbDelta18oEnum); _assert_(N==2); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceAnalysis.cpp (revision 20645) @@ -41,12 +41,12 @@ /*Fetch parameters: */ - iomodel->Constant(&g,ConstantsGEnum); - iomodel->Constant(&rho_ice,MaterialsRhoIceEnum); - iomodel->Constant(&FSreconditioning,StressbalanceFSreconditioningEnum); - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&isSSA,FlowequationIsSSAEnum); - iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum); - iomodel->Constant(&isHO,FlowequationIsHOEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&g,ConstantsGEnum); + iomodel->FindConstant(&rho_ice,MaterialsRhoIceEnum); + iomodel->FindConstant(&FSreconditioning,StressbalanceFSreconditioningEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isSSA,FlowequationIsSSAEnum); + iomodel->FindConstant(&isL1L2,FlowequationIsL1L2Enum); + iomodel->FindConstant(&isHO,FlowequationIsHOEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); /*Now, is the flag macayaealHO on? otherwise, do nothing: */ @@ -63,8 +63,8 @@ /*Get finite element type*/ - if(isSSA) iomodel->Constant(&finiteelement,FlowequationFeSSAEnum); + if(isSSA) iomodel->FindConstant(&finiteelement,FlowequationFeSSAEnum); else if(isL1L2) finiteelement = P1Enum; - else if(isHO) iomodel->Constant(&finiteelement,FlowequationFeHOEnum); - else if(isFS){ iomodel->Constant(&finiteelement,FlowequationFeFSEnum); + else if(isHO) iomodel->FindConstant(&finiteelement,FlowequationFeHOEnum); + else if(isFS){ iomodel->FindConstant(&finiteelement,FlowequationFeFSEnum); /*Deduce velocity interpolation from finite element*/ switch(finiteelement){ @@ -451,9 +451,9 @@ /*Fetch parameters: */ - iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); - iomodel->Constant(&isSSA,FlowequationIsSSAEnum); - iomodel->Constant(&isHO,FlowequationIsHOEnum); - iomodel->Constant(&numrifts,RiftsNumriftsEnum); + iomodel->FindConstant(&isL1L2,FlowequationIsL1L2Enum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&isSSA,FlowequationIsSSAEnum); + iomodel->FindConstant(&isHO,FlowequationIsHOEnum); + iomodel->FindConstant(&numrifts,RiftsNumriftsEnum); /*Now, is the flag macayaealHO on? otherwise, do nothing: */ @@ -507,8 +507,8 @@ /*Fetch parameters: */ - iomodel->Constant(&isSSA,FlowequationIsSSAEnum); - iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum); - iomodel->Constant(&isHO,FlowequationIsHOEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&isSSA,FlowequationIsSSAEnum); + iomodel->FindConstant(&isL1L2,FlowequationIsL1L2Enum); + iomodel->FindConstant(&isHO,FlowequationIsHOEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); /*Now, check that we have non SIA elements */ @@ -527,5 +527,5 @@ if(isSSA){ approximation=SSAApproximationEnum; - iomodel->Constant(&finiteelement,FlowequationFeSSAEnum); + iomodel->FindConstant(&finiteelement,FlowequationFeSSAEnum); } else if(isL1L2){ @@ -535,9 +535,9 @@ else if(isHO){ approximation = HOApproximationEnum; - iomodel->Constant(&finiteelement,FlowequationFeHOEnum); + iomodel->FindConstant(&finiteelement,FlowequationFeHOEnum); } else if(isFS){ approximation = FSApproximationEnum; - iomodel->Constant(&finiteelement,FlowequationFeFSEnum); + iomodel->FindConstant(&finiteelement,FlowequationFeFSEnum); } iomodel->FetchData(3,FlowequationBorderSSAEnum,FlowequationVertexEquationEnum,StressbalanceReferentialEnum); @@ -681,13 +681,13 @@ /*Fetch constants needed: */ - iomodel->Constant(&isSSA,FlowequationIsSSAEnum); - iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum); - iomodel->Constant(&isHO,FlowequationIsHOEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&materials_type,MaterialsEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&isSSA,FlowequationIsSSAEnum); + iomodel->FindConstant(&isL1L2,FlowequationIsL1L2Enum); + iomodel->FindConstant(&isHO,FlowequationIsHOEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&materials_type,MaterialsEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); /*return if no processing required*/ @@ -706,8 +706,8 @@ /*Get finite element type*/ if(!iscoupling){ - if(isSSA) iomodel->Constant(&finiteelement,FlowequationFeSSAEnum); + if(isSSA) iomodel->FindConstant(&finiteelement,FlowequationFeSSAEnum); else if(isL1L2) finiteelement = P1Enum; - else if(isHO) iomodel->Constant(&finiteelement,FlowequationFeHOEnum); - else if(isFS) iomodel->Constant(&finiteelement,FlowequationFeFSEnum); + else if(isHO) iomodel->FindConstant(&finiteelement,FlowequationFeHOEnum); + else if(isFS) iomodel->FindConstant(&finiteelement,FlowequationFeFSEnum); for(int i=0;inumberofelements;i++){ finiteelement_list[i]=finiteelement; @@ -773,5 +773,5 @@ } /*LATH parameters*/ - iomodel->Constant(&fe_FS,FlowequationFeFSEnum); + iomodel->FindConstant(&fe_FS,FlowequationFeFSEnum); if(fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum){ InputUpdateFromConstantx(elements,0.,SigmaNNEnum); @@ -790,5 +790,5 @@ break; case 3: - iomodel->Constant(&FrictionCoupling,FrictionCouplingEnum); + iomodel->FindConstant(&FrictionCoupling,FrictionCouplingEnum); iomodel->FetchDataToInput(elements,FrictionCEnum); iomodel->FetchDataToInput(elements,FrictionAsEnum); @@ -862,5 +862,5 @@ /*XTH LATH parameters*/ - iomodel->Constant(&fe_FS,FlowequationFeFSEnum); + iomodel->FindConstant(&fe_FS,FlowequationFeFSEnum); if(fe_FS==XTaylorHoodEnum || fe_FS==LATaylorHoodEnum || fe_FS==LACrouzeixRaviartEnum){ parameters->AddObject(iomodel->CopyConstantObject(AugmentedLagrangianREnum)); @@ -869,5 +869,5 @@ } - iomodel->Constant(&materials_type,MaterialsEnum); + iomodel->FindConstant(&materials_type,MaterialsEnum); if(materials_type==MatdamageiceEnum){ parameters->AddObject(iomodel->CopyConstantObject(DamageLawEnum)); @@ -884,5 +884,5 @@ /*Deal with friction parameters*/ int frictionlaw; - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum)); if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject(FrictionCouplingEnum)); Index: /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceSIAAnalysis.cpp (revision 20645) @@ -13,9 +13,9 @@ /*Fetch parameters: */ - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&isSSA,FlowequationIsSSAEnum); - iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum); - iomodel->Constant(&isHO,FlowequationIsHOEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isSSA,FlowequationIsSSAEnum); + iomodel->FindConstant(&isL1L2,FlowequationIsL1L2Enum); + iomodel->FindConstant(&isHO,FlowequationIsHOEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); /*Now, is the flag isSIA on? otherwise, do nothing: */ @@ -83,5 +83,5 @@ /*Fetch parameters: */ - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); /*Now, is the flag isSIA on? otherwise, do nothing: */ @@ -124,7 +124,7 @@ bool ismovingfront; int frictionlaw; - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); /*Now, is the flag SIA on? otherwise, do nothing: */ Index: /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/StressbalanceVerticalAnalysis.cpp (revision 20645) @@ -18,9 +18,9 @@ /*Fetch parameters: */ - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&isSSA,FlowequationIsSSAEnum); - iomodel->Constant(&isL1L2,FlowequationIsL1L2Enum); - iomodel->Constant(&isHO,FlowequationIsHOEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isSSA,FlowequationIsSSAEnum); + iomodel->FindConstant(&isL1L2,FlowequationIsL1L2Enum); + iomodel->FindConstant(&isHO,FlowequationIsHOEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); /*Do we have coupling*/ Index: /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/ThermalAnalysis.cpp (revision 20645) @@ -24,5 +24,5 @@ else if (iomodel->solution_enum==TransientSolutionEnum){ int smb_model; - iomodel->Constant(&smb_model,SmbEnum); + iomodel->FindConstant(&smb_model,SmbEnum); if(smb_model==SMBpddEnum) isdynamic=true; if(smb_model==SMBd18opddEnum) isdynamic=true; @@ -90,7 +90,7 @@ bool dakota_analysis, ismovingfront; - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); iomodel->FetchDataToInput(elements,ThicknessEnum); @@ -120,5 +120,5 @@ } /*Basal forcings variables*/ - iomodel->Constant(&basalforcing_model,BasalforcingsEnum); + iomodel->FindConstant(&basalforcing_model,BasalforcingsEnum); switch(basalforcing_model){ case MantlePlumeGeothermalFluxEnum: @@ -140,5 +140,5 @@ break; case 3: - iomodel->Constant(&FrictionCoupling,FrictionCouplingEnum); + iomodel->FindConstant(&FrictionCoupling,FrictionCouplingEnum); iomodel->FetchDataToInput(elements,FrictionCEnum); iomodel->FetchDataToInput(elements,FrictionAsEnum); @@ -192,5 +192,5 @@ /*Deal with friction parameters*/ int frictionlaw; - iomodel->Constant(&frictionlaw,FrictionLawEnum); + iomodel->FindConstant(&frictionlaw,FrictionLawEnum); if(frictionlaw==4 || frictionlaw==6) parameters->AddObject(iomodel->CopyConstantObject(FrictionGammaEnum)); if(frictionlaw==3) parameters->AddObject(iomodel->CopyConstantObject(FrictionCouplingEnum)); Index: /issm/trunk-jpl/src/c/analyses/UzawaPressureAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/analyses/UzawaPressureAnalysis.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/analyses/UzawaPressureAnalysis.cpp (revision 20645) @@ -17,5 +17,5 @@ int fe_FS; - iomodel->Constant(&fe_FS,FlowequationFeFSEnum); + iomodel->FindConstant(&fe_FS,FlowequationFeFSEnum); if(fe_FS==LATaylorHoodEnum) finiteelement = P1Enum; else if(fe_FS==LACrouzeixRaviartEnum) finiteelement = P1DGEnum; @@ -34,5 +34,5 @@ int fe_FS; - iomodel->Constant(&fe_FS,FlowequationFeFSEnum); + iomodel->FindConstant(&fe_FS,FlowequationFeFSEnum); if(fe_FS==LATaylorHoodEnum) finiteelement = P1Enum; else if(fe_FS==LACrouzeixRaviartEnum) finiteelement = P1DGEnum; Index: /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/Elements/Penta.cpp (revision 20645) @@ -1399,8 +1399,8 @@ /*Fetch parameters: */ - iomodel->Constant(&yts,ConstantsYtsEnum); - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); - if(control_analysis) iomodel->Constant(&num_responses,InversionNumCostFunctionsEnum); + iomodel->FindConstant(&yts,ConstantsYtsEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + if(control_analysis) iomodel->FindConstant(&num_control_type,InversionNumControlParametersEnum); + if(control_analysis) iomodel->FindConstant(&num_responses,InversionNumCostFunctionsEnum); /*Recover vertices ids needed to initialize inputs*/ @@ -2696,6 +2696,6 @@ /*Fetch parameters: */ - iomodel->Constant(&yts,ConstantsYtsEnum); - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&yts,ConstantsYtsEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); /*Checks if debuging*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/Elements/Tetra.cpp (revision 20645) @@ -370,8 +370,8 @@ /*Fetch parameters: */ - iomodel->Constant(&yts,ConstantsYtsEnum); - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); - if(control_analysis) iomodel->Constant(&num_responses,InversionNumCostFunctionsEnum); + iomodel->FindConstant(&yts,ConstantsYtsEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + if(control_analysis) iomodel->FindConstant(&num_control_type,InversionNumControlParametersEnum); + if(control_analysis) iomodel->FindConstant(&num_responses,InversionNumCostFunctionsEnum); /*Recover vertices ids needed to initialize inputs*/ @@ -874,7 +874,7 @@ /*Fetch parameters: */ - iomodel->Constant(&yts,ConstantsYtsEnum); - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&yts,ConstantsYtsEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); /*Checks if debuging*/ Index: /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/Elements/Tria.cpp (revision 20645) @@ -1811,8 +1811,8 @@ /*Get parameters: */ - iomodel->Constant(&yts,ConstantsYtsEnum); - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); - if(control_analysis) iomodel->Constant(&num_responses,InversionNumCostFunctionsEnum); + iomodel->FindConstant(&yts,ConstantsYtsEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + if(control_analysis) iomodel->FindConstant(&num_control_type,InversionNumControlParametersEnum); + if(control_analysis) iomodel->FindConstant(&num_responses,InversionNumCostFunctionsEnum); /*Recover vertices ids needed to initialize inputs*/ Index: /issm/trunk-jpl/src/c/classes/FemModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/FemModel.cpp (revision 20645) @@ -438,7 +438,7 @@ bool isSIA,isFS; int fe_FS; - iomodel->Constant(&fe_FS,FlowequationFeFSEnum); - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&fe_FS,FlowequationFeFSEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); analyses_temp[numanalyses++]=StressbalanceAnalysisEnum; analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum; @@ -457,6 +457,6 @@ case SteadystateSolutionEnum:{ bool isSIA,isenthalpy; - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isenthalpy,ThermalIsenthalpyEnum); analyses_temp[numanalyses++]=StressbalanceAnalysisEnum; analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum; @@ -477,5 +477,5 @@ case ThermalSolutionEnum:{ bool isenthalpy; - iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); + iomodel->FindConstant(&isenthalpy,ThermalIsenthalpyEnum); if(isenthalpy){ analyses_temp[numanalyses++]=EnthalpyAnalysisEnum; @@ -546,20 +546,20 @@ case TransientSolutionEnum:{ bool isSIA,isFS,isthermal,isenthalpy,ismasstransport,isgroundingline,isstressbalance,ismovingfront,ishydrology,isdamage,issmb,isslr,isgia; - iomodel->Constant(&isSIA,FlowequationIsSIAEnum); - iomodel->Constant(&isFS,FlowequationIsFSEnum); - iomodel->Constant(&isthermal,TransientIsthermalEnum); - iomodel->Constant(&isenthalpy,ThermalIsenthalpyEnum); - iomodel->Constant(&ismovingfront,TransientIsmovingfrontEnum); - iomodel->Constant(&ismasstransport,TransientIsmasstransportEnum); - iomodel->Constant(&isstressbalance,TransientIsstressbalanceEnum); - iomodel->Constant(&isgroundingline,TransientIsgroundinglineEnum); - iomodel->Constant(&isdamage,TransientIsdamageevolutionEnum); - iomodel->Constant(&ishydrology,TransientIshydrologyEnum); - iomodel->Constant(&issmb,TransientIssmbEnum); - iomodel->Constant(&isslr,TransientIsslrEnum); - iomodel->Constant(&isgia,TransientIsgiaEnum); + iomodel->FindConstant(&isSIA,FlowequationIsSIAEnum); + iomodel->FindConstant(&isFS,FlowequationIsFSEnum); + iomodel->FindConstant(&isthermal,TransientIsthermalEnum); + iomodel->FindConstant(&isenthalpy,ThermalIsenthalpyEnum); + iomodel->FindConstant(&ismovingfront,TransientIsmovingfrontEnum); + iomodel->FindConstant(&ismasstransport,TransientIsmasstransportEnum); + iomodel->FindConstant(&isstressbalance,TransientIsstressbalanceEnum); + iomodel->FindConstant(&isgroundingline,TransientIsgroundinglineEnum); + iomodel->FindConstant(&isdamage,TransientIsdamageevolutionEnum); + iomodel->FindConstant(&ishydrology,TransientIshydrologyEnum); + iomodel->FindConstant(&issmb,TransientIssmbEnum); + iomodel->FindConstant(&isslr,TransientIsslrEnum); + iomodel->FindConstant(&isgia,TransientIsgiaEnum); if(isstressbalance){ int fe_FS; - iomodel->Constant(&fe_FS,FlowequationFeFSEnum); + iomodel->FindConstant(&fe_FS,FlowequationFeFSEnum); analyses_temp[numanalyses++]=StressbalanceAnalysisEnum; analyses_temp[numanalyses++]=StressbalanceVerticalAnalysisEnum; Index: /issm/trunk-jpl/src/c/classes/IoModel.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/IoModel.cpp (revision 20645) @@ -244,5 +244,5 @@ } /*}}}*/ -void IoModel::Constant(bool* poutput,int constant_enum){/*{{{*/ +void IoModel::FindConstant(bool* poutput,int constant_enum){/*{{{*/ _assert_(constant_enum>=0); @@ -252,5 +252,5 @@ } /*}}}*/ -void IoModel::Constant(int* poutput,int constant_enum){/*{{{*/ +void IoModel::FindConstant(int* poutput,int constant_enum){/*{{{*/ _assert_(constant_enum>=0); @@ -260,5 +260,5 @@ } /*}}}*/ -void IoModel::Constant(IssmDouble* poutput,int constant_enum){/*{{{*/ +void IoModel::FindConstant(IssmDouble* poutput,int constant_enum){/*{{{*/ _assert_(constant_enum>=0); @@ -268,5 +268,5 @@ } /*}}}*/ -void IoModel::Constant(char** poutput,int constant_enum){/*{{{*/ +void IoModel::FindConstant(char** poutput,int constant_enum){/*{{{*/ _assert_(constant_enum>=0); Index: /issm/trunk-jpl/src/c/classes/IoModel.h =================================================================== --- /issm/trunk-jpl/src/c/classes/IoModel.h (revision 20644) +++ /issm/trunk-jpl/src/c/classes/IoModel.h (revision 20645) @@ -66,8 +66,8 @@ /*Input/Output*/ void CheckEnumSync(void); - void Constant(bool *poutput,int constant_enum); - void Constant(int *poutput,int constant_enum); - void Constant(IssmDouble *poutput,int constant_enum); - void Constant(char **poutput,int constant_enum); + void FindConstant(bool *poutput,int constant_enum); + void FindConstant(int *poutput,int constant_enum); + void FindConstant(IssmDouble *poutput,int constant_enum); + void FindConstant(char **poutput,int constant_enum); Param *CopyConstantObject(int constant_enum); IssmDouble *Data(int dataenum); Index: /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/Loads/Riftfront.cpp (revision 20645) @@ -46,5 +46,5 @@ /*Fetch parameters: */ - iomodel->Constant(&penalty_lock,StressbalanceRiftPenaltyLockEnum); + iomodel->FindConstant(&penalty_lock,StressbalanceRiftPenaltyLockEnum); /*Ok, retrieve all the data needed to add a penalty between the two nodes: */ Index: /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/Materials/Matice.cpp (revision 20645) @@ -49,5 +49,5 @@ /*Other perporties*/ int materialtype; - iomodel->Constant(&materialtype,MaterialsEnum); + iomodel->FindConstant(&materialtype,MaterialsEnum); if(materialtype==MatdamageiceEnum) this->isdamaged = true; else if(materialtype==MaticeEnum) this->isdamaged = false; Index: /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/classes/Materials/Matpar.cpp (revision 20645) @@ -73,7 +73,7 @@ bool isefficientlayer; int hydrology_model,smb_model,materials_type; - iomodel->Constant(&hydrology_model,HydrologyModelEnum); - iomodel->Constant(&smb_model,SmbEnum); - iomodel->Constant(&materials_type,MaterialsEnum); + iomodel->FindConstant(&hydrology_model,HydrologyModelEnum); + iomodel->FindConstant(&smb_model,SmbEnum); + iomodel->FindConstant(&materials_type,MaterialsEnum); this->mid = matpar_mid; @@ -83,18 +83,18 @@ case MatdamageiceEnum: case MatbaflEnum: - iomodel->Constant(&this->rho_ice,MaterialsRhoIceEnum); - iomodel->Constant(&this->rho_water,MaterialsRhoSeawaterEnum); - iomodel->Constant(&this->rho_freshwater,MaterialsRhoFreshwaterEnum); - iomodel->Constant(&this->mu_water,MaterialsMuWaterEnum); - iomodel->Constant(&this->heatcapacity,MaterialsHeatcapacityEnum); - iomodel->Constant(&this->thermalconductivity,MaterialsThermalconductivityEnum); - iomodel->Constant(&this->temperateiceconductivity,MaterialsTemperateiceconductivityEnum); - iomodel->Constant(&this->latentheat,MaterialsLatentheatEnum); - iomodel->Constant(&this->beta,MaterialsBetaEnum); - iomodel->Constant(&this->meltingpoint,MaterialsMeltingpointEnum); - iomodel->Constant(&this->referencetemperature,ConstantsReferencetemperatureEnum); - iomodel->Constant(&this->mixed_layer_capacity,MaterialsMixedLayerCapacityEnum); - iomodel->Constant(&this->thermal_exchange_velocity,MaterialsThermalExchangeVelocityEnum); - iomodel->Constant(&this->g,ConstantsGEnum); + iomodel->FindConstant(&this->rho_ice,MaterialsRhoIceEnum); + iomodel->FindConstant(&this->rho_water,MaterialsRhoSeawaterEnum); + iomodel->FindConstant(&this->rho_freshwater,MaterialsRhoFreshwaterEnum); + iomodel->FindConstant(&this->mu_water,MaterialsMuWaterEnum); + iomodel->FindConstant(&this->heatcapacity,MaterialsHeatcapacityEnum); + iomodel->FindConstant(&this->thermalconductivity,MaterialsThermalconductivityEnum); + iomodel->FindConstant(&this->temperateiceconductivity,MaterialsTemperateiceconductivityEnum); + iomodel->FindConstant(&this->latentheat,MaterialsLatentheatEnum); + iomodel->FindConstant(&this->beta,MaterialsBetaEnum); + iomodel->FindConstant(&this->meltingpoint,MaterialsMeltingpointEnum); + iomodel->FindConstant(&this->referencetemperature,ConstantsReferencetemperatureEnum); + iomodel->FindConstant(&this->mixed_layer_capacity,MaterialsMixedLayerCapacityEnum); + iomodel->FindConstant(&this->thermal_exchange_velocity,MaterialsThermalExchangeVelocityEnum); + iomodel->FindConstant(&this->g,ConstantsGEnum); switch(smb_model){ @@ -103,17 +103,17 @@ break; case SMBgembEnum: - iomodel->Constant(&this->albedo_ice,SmbAIceEnum); - iomodel->Constant(&this->albedo_snow,SmbASnowEnum); + iomodel->FindConstant(&this->albedo_ice,SmbAIceEnum); + iomodel->FindConstant(&this->albedo_snow,SmbASnowEnum); break; case SMBpddEnum: - iomodel->Constant(&this->desfac,SmbDesfacEnum); - iomodel->Constant(&this->rlaps,SmbRlapsEnum); - iomodel->Constant(&this->rlapslgm,SmbRlapslgmEnum); + iomodel->FindConstant(&this->desfac,SmbDesfacEnum); + iomodel->FindConstant(&this->rlaps,SmbRlapsEnum); + iomodel->FindConstant(&this->rlapslgm,SmbRlapslgmEnum); break; case SMBd18opddEnum: - iomodel->Constant(&this->desfac,SmbDesfacEnum); - iomodel->Constant(&this->rlaps,SmbRlapsEnum); - iomodel->Constant(&this->rlapslgm,SmbRlapslgmEnum); - iomodel->Constant(&this->dpermil,SmbDpermilEnum); + iomodel->FindConstant(&this->desfac,SmbDesfacEnum); + iomodel->FindConstant(&this->rlaps,SmbRlapsEnum); + iomodel->FindConstant(&this->rlapslgm,SmbRlapslgmEnum); + iomodel->FindConstant(&this->dpermil,SmbDpermilEnum); case SMBgradientsEnum: break; @@ -133,17 +133,17 @@ } if(hydrology_model==HydrologydcEnum){ - iomodel->Constant(&this->sediment_compressibility,HydrologydcSedimentCompressibilityEnum); - iomodel->Constant(&this->sediment_porosity,HydrologydcSedimentPorosityEnum); - iomodel->Constant(&this->sediment_thickness,HydrologydcSedimentThicknessEnum); - iomodel->Constant(&this->water_compressibility,HydrologydcWaterCompressibilityEnum); - iomodel->Constant(&isefficientlayer,HydrologydcIsefficientlayerEnum); + iomodel->FindConstant(&this->sediment_compressibility,HydrologydcSedimentCompressibilityEnum); + iomodel->FindConstant(&this->sediment_porosity,HydrologydcSedimentPorosityEnum); + iomodel->FindConstant(&this->sediment_thickness,HydrologydcSedimentThicknessEnum); + iomodel->FindConstant(&this->water_compressibility,HydrologydcWaterCompressibilityEnum); + iomodel->FindConstant(&isefficientlayer,HydrologydcIsefficientlayerEnum); if(isefficientlayer){ - iomodel->Constant(&this->epl_compressibility,HydrologydcEplCompressibilityEnum); - iomodel->Constant(&this->epl_porosity,HydrologydcEplPorosityEnum); - iomodel->Constant(&this->epl_init_thickness,HydrologydcEplInitialThicknessEnum); - iomodel->Constant(&this->epl_colapse_thickness,HydrologydcEplColapseThicknessEnum); - iomodel->Constant(&this->epl_max_thickness,HydrologydcEplMaxThicknessEnum); - iomodel->Constant(&this->epl_conductivity,HydrologydcEplConductivityEnum); + iomodel->FindConstant(&this->epl_compressibility,HydrologydcEplCompressibilityEnum); + iomodel->FindConstant(&this->epl_porosity,HydrologydcEplPorosityEnum); + iomodel->FindConstant(&this->epl_init_thickness,HydrologydcEplInitialThicknessEnum); + iomodel->FindConstant(&this->epl_colapse_thickness,HydrologydcEplColapseThicknessEnum); + iomodel->FindConstant(&this->epl_max_thickness,HydrologydcEplMaxThicknessEnum); + iomodel->FindConstant(&this->epl_conductivity,HydrologydcEplConductivityEnum); } } @@ -159,11 +159,11 @@ /*gia: */ - iomodel->Constant(&this->lithosphere_shear_modulus,MaterialsLithosphereShearModulusEnum); - iomodel->Constant(&this->lithosphere_density,MaterialsLithosphereDensityEnum); - iomodel->Constant(&this->mantle_shear_modulus,MaterialsMantleShearModulusEnum); - iomodel->Constant(&this->mantle_density,MaterialsMantleDensityEnum); + iomodel->FindConstant(&this->lithosphere_shear_modulus,MaterialsLithosphereShearModulusEnum); + iomodel->FindConstant(&this->lithosphere_density,MaterialsLithosphereDensityEnum); + iomodel->FindConstant(&this->mantle_shear_modulus,MaterialsMantleShearModulusEnum); + iomodel->FindConstant(&this->mantle_density,MaterialsMantleDensityEnum); /*slr:*/ - iomodel->Constant(&this->earth_density,MaterialsEarthDensityEnum); + iomodel->FindConstant(&this->earth_density,MaterialsEarthDensityEnum); break; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Autodiff/CreateParametersAutodiff.cpp (revision 20645) @@ -28,5 +28,5 @@ /*retrieve some parameters: */ - iomodel->Constant(&autodiff_analysis,AutodiffIsautodiffEnum); + iomodel->FindConstant(&autodiff_analysis,AutodiffIsautodiffEnum); #ifdef _HAVE_ADOLC_ @@ -83,5 +83,5 @@ /*}}}*/ /*retrieve driver: {{{*/ - iomodel->Constant(&autodiff_driver,AutodiffDriverEnum); + iomodel->FindConstant(&autodiff_driver,AutodiffDriverEnum); parameters->AddObject(iomodel->CopyConstantObject(AutodiffDriverEnum)); @@ -101,5 +101,5 @@ /*}}}*/ /*Deal with dependents first: {{{*/ - iomodel->Constant(&num_dependent_objects,AutodiffNumDependentObjectsEnum); + iomodel->FindConstant(&num_dependent_objects,AutodiffNumDependentObjectsEnum); dependent_objects=new DataSet(); num_dep=0; Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/CreateParametersControl.cpp (revision 20645) @@ -23,6 +23,6 @@ /*retrieve some parameters: */ - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - iomodel->Constant(&inversiontype,InversionTypeEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + iomodel->FindConstant(&inversiontype,InversionTypeEnum); if(control_analysis){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Control/UpdateElementsAndMaterialsControl.cpp (revision 20645) @@ -19,6 +19,6 @@ /*Fetch parameters: */ - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - if(control_analysis) iomodel->Constant(&num_control_type,InversionNumControlParametersEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + if(control_analysis) iomodel->FindConstant(&num_control_type,InversionNumControlParametersEnum); /*Now, return if no control*/ @@ -28,6 +28,6 @@ /*Fetch Observations */ - iomodel->Constant(&num_cost_functions,InversionNumCostFunctionsEnum); - iomodel->Constant(&domaintype,DomainTypeEnum); + iomodel->FindConstant(&num_cost_functions,InversionNumCostFunctionsEnum); + iomodel->FindConstant(&domaintype,DomainTypeEnum); for(int i=0;i(iomodel->Data(InversionCostFunctionsEnum)[i]); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateElementsVerticesAndMaterials.cpp (revision 20645) @@ -17,7 +17,7 @@ /*Fetch parameters: */ - iomodel->Constant(&control_analysis,InversionIscontrolEnum); - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); - iomodel->Constant(&materials_type,MaterialsEnum); + iomodel->FindConstant(&control_analysis,InversionIscontrolEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&materials_type,MaterialsEnum); /*Did we already create the elements? : */ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/CreateParameters.cpp (revision 20645) @@ -99,5 +99,5 @@ /*Basal forcing parameters*/ parameters->AddObject(iomodel->CopyConstantObject(BasalforcingsEnum)); - iomodel->Constant(&basalforcing_model,BasalforcingsEnum); + iomodel->FindConstant(&basalforcing_model,BasalforcingsEnum); switch(basalforcing_model){ case FloatingMeltRateEnum: @@ -135,5 +135,5 @@ parameters->AddObject(new IntParam(SolutionTypeEnum,solution_type)); - iomodel->Constant(&time,TimesteppingStartTimeEnum); + iomodel->FindConstant(&time,TimesteppingStartTimeEnum); parameters->AddObject(new DoubleParam(TimeEnum,time)); parameters->AddObject(new IntParam(StepEnum,0)); @@ -153,5 +153,5 @@ iomodel->DeleteData(&requestedoutputs,numoutputs,SteadystateRequestedOutputsEnum); - iomodel->Constant(&materialtype,MaterialsEnum); + iomodel->FindConstant(&materialtype,MaterialsEnum); if(materialtype==MatdamageiceEnum){ iomodel->FetchData(&requestedoutputs,&numoutputs,DamageEvolutionRequestedOutputsEnum); Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/CreateParametersDakota.cpp (revision 20645) @@ -36,10 +36,10 @@ /*recover parameters: */ - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); if(dakota_analysis){ - iomodel->Constant(&name,MiscellaneousNameEnum); - iomodel->Constant(&numberofresponses,QmuNumberofresponsesEnum); + iomodel->FindConstant(&name,MiscellaneousNameEnum); + iomodel->FindConstant(&numberofresponses,QmuNumberofresponsesEnum); /*name of qmu input, error and output files*/ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/Dakota/UpdateElementsAndMaterialsDakota.cpp (revision 20645) @@ -13,5 +13,5 @@ /*recover parameters: */ bool dakota_analysis; - iomodel->Constant(&dakota_analysis,QmuIsdakotaEnum); + iomodel->FindConstant(&dakota_analysis,QmuIsdakotaEnum); if(dakota_analysis){ Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ElementsAndVerticesPartitioning.cpp (revision 20645) @@ -44,5 +44,5 @@ /*Fetch parameters: */ - iomodel->Constant(&numrifts,RiftsNumriftsEnum); + iomodel->FindConstant(&numrifts,RiftsNumriftsEnum); /*First, check that partitioning has not yet been carryed out. Just check whether my_elements pointers is not already assigned a value: */ @@ -67,7 +67,7 @@ elements_width=6; iomodel->FetchData(&elements2d,NULL,NULL,MeshElements2dEnum); - iomodel->Constant(&numberofelements2d,MeshNumberofelements2dEnum); - iomodel->Constant(&numberofvertices2d,MeshNumberofvertices2dEnum); - iomodel->Constant(&numlayers,MeshNumberoflayersEnum); + iomodel->FindConstant(&numberofelements2d,MeshNumberofelements2dEnum); + iomodel->FindConstant(&numberofvertices2d,MeshNumberofvertices2dEnum); + iomodel->FindConstant(&numlayers,MeshNumberoflayersEnum); break; default: Index: /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/ModelProcessorx/ModelProcessorx.cpp (revision 20645) @@ -27,5 +27,5 @@ /*Fetch parameters: */ - iomodel->Constant(&verbose,VerboseEnum); + iomodel->FindConstant(&verbose,VerboseEnum); SetVerbosityLevel(verbose); Index: /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (revision 20644) +++ /issm/trunk-jpl/src/c/modules/SurfaceMassBalancex/SurfaceMassBalancex.cpp (revision 20645) @@ -203,5 +203,5 @@ /* Get constants */ femmodel->parameters->FindParam(&yts,ConstantsYtsEnum); - /*iomodel->Constant(&yts,ConstantsYtsEnum);*/ + /*iomodel->FindConstant(&yts,ConstantsYtsEnum);*/ /*this->parameters->FindParam(&yts,ConstantsYtsEnum);*/ /*Mathieu original*/