Index: /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14687) +++ /issm/trunk-jpl/src/c/EnumDefinitions/EnumDefinitions.h (revision 14688) @@ -11,5 +11,5 @@ enum definitions{ - /*Model fields {{{1*/ + /*Model fields {{{*/ AutodiffIsautodiffEnum, AutodiffNumDependentsEnum, @@ -233,5 +233,5 @@ TransientRequestedOutputsEnum, /*}}}*/ - /*Solutions and Analyses{{{1 */ + /*Solutions and Analyses{{{ */ SolutionTypeEnum, AnalysisTypeEnum, @@ -241,4 +241,6 @@ AdjointSolutionEnum, AnalysisCounterEnum, + NoneAnalysisEnum, + DefaultAnalysisEnum, BalancethicknessAnalysisEnum, BalancethicknessSolutionEnum, @@ -260,5 +262,4 @@ HydrologySolutionEnum, MeltingAnalysisEnum, - NoneAnalysisEnum, PrognosticAnalysisEnum, PrognosticSolutionEnum, @@ -274,5 +275,5 @@ GiaAnalysisEnum, /*}}}*/ - /*Approximations {{{1*/ + /*Approximations {{{*/ ApproximationEnum, NoneApproximationEnum, @@ -286,5 +287,5 @@ StokesApproximationEnum, /*}}}*/ - /*Datasets {{{1*/ + /*Datasets {{{*/ ConstraintsEnum, LoadsEnum, @@ -295,5 +296,5 @@ ResultsEnum, /*}}}*/ - /*Objects {{{1*/ + /*Objects {{{*/ GenericParamEnum, AdolcParamEnum, @@ -321,4 +322,5 @@ IntVecParamEnum, TransientParamEnum, + IceFrontTypeEnum, MacAyeal2dIceFrontEnum, MacAyeal3dIceFrontEnum, @@ -328,4 +330,5 @@ NodeEnum, NumericalfluxEnum, + NumericalfluxTypeEnum, ParamEnum, L1L2IceFrontEnum, @@ -339,4 +342,5 @@ VectorParamEnum, RiftfrontEnum, + RiftfrontTypeEnum, SegmentEnum, SegmentRiftfrontEnum, @@ -351,5 +355,5 @@ VertexEnum, /*}}}*/ - /*Fill {{{1*/ + /*Fill {{{*/ AirEnum, IceEnum, @@ -357,10 +361,10 @@ WaterEnum, /*}}}*/ - /*Rift state {{{1*/ + /*Rift state {{{*/ ClosedEnum, FreeEnum, OpenEnum, /*}}}*/ - /*Inputs {{{1*/ + /*Inputs {{{*/ AdjointpEnum, AdjointxEnum, @@ -410,5 +414,4 @@ TemperaturePicardEnum, ThicknessAbsMisfitEnum, - TypeEnum, VelEnum, VelocityEnum, @@ -453,10 +456,10 @@ GiaWEnum, /*}}}*/ - /*Element Interpolations{{{1*/ + /*Element Interpolations{{{*/ P0Enum, P1Enum, P1DGEnum, /*}}}*/ - /*Results{{{1*/ + /*Results{{{*/ SaveResultsEnum, BoolElementResultEnum, @@ -477,5 +480,5 @@ WaterColumnOldEnum, /*}}}*/ - /*Responses{{{1*/ + /*Responses{{{*/ MinVelEnum, MaxVelEnum, @@ -492,10 +495,10 @@ TotalSmbEnum, /*}}}*/ - /*Convergence{{{1*/ + /*Convergence{{{*/ RelativeEnum, AbsoluteEnum, IncrementalEnum, /*}}}*/ - /*Grounding Line{{{1*/ + /*Grounding Line{{{*/ AgressiveMigrationEnum, NoneEnum, @@ -505,8 +508,8 @@ GLlevelsetEnum, /*}}}*/ - /*Solver{{{1*/ + /*Solver{{{*/ StokesSolverEnum, /*}}}*/ - /*Parameters{{{1*/ + /*Parameters{{{*/ AdjointEnum, ColinearEnum, @@ -538,14 +541,14 @@ VerboseEnum, /*}}}*/ - /*Interpolation {{{1*/ + /*Interpolation {{{*/ TriangleInterpEnum, BilinearInterpEnum, NearestInterpEnum, /*}}}*/ - /*Coordinate Systems{{{1*/ + /*Coordinate Systems{{{*/ XYEnum, XYZPEnum, /*}}}*/ - /*Toolkits{{{1*/ + /*Toolkits{{{*/ DenseEnum, MpiDenseEnum, @@ -553,5 +556,5 @@ MpiEnum, /*}}}*/ - /*Options{{{1*/ + /*Options{{{*/ OptionEnum, GenericOptionEnum, @@ -562,5 +565,5 @@ OptionLogicalEnum, /*}}}*/ - /*Rheology law (move too Material) {{{1*/ + /*Rheology law (move too Material) {{{*/ PatersonEnum, ArrheniusEnum, Index: /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/classes/ToolkitOptions.cpp (revision 14688) @@ -35,5 +35,5 @@ }/*}}}*/ -char* ToolkitOptions::GetToolkitOptionValue(char* option){ /*{{{*/ +char* ToolkitOptions::GetToolkitOptionValue(const char* option){ /*{{{*/ return TokenValue(toolkitoptions,option); Index: /issm/trunk-jpl/src/c/classes/ToolkitOptions.h =================================================================== --- /issm/trunk-jpl/src/c/classes/ToolkitOptions.h (revision 14687) +++ /issm/trunk-jpl/src/c/classes/ToolkitOptions.h (revision 14688) @@ -26,5 +26,5 @@ static void Init(char* options); static char* GetToolkitType(void); - static char* GetToolkitOptionValue(char* option); + static char* GetToolkitOptionValue(const char* option); }; Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Icefront.cpp (revision 14688) @@ -103,5 +103,5 @@ this->inputs=new Inputs(); this->inputs->AddInput(new IntInput(FillEnum,icefront_fill)); - this->inputs->AddInput(new IntInput(TypeEnum,in_icefront_type)); + this->inputs->AddInput(new IntInput(IceFrontTypeEnum,in_icefront_type)); //parameters and hooked fields: we still can't point to them, they may not even exist. Configure will handle this. @@ -275,5 +275,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,IceFrontTypeEnum); _assert_(sidlist); _assert_(nodes); @@ -299,5 +299,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,IceFrontTypeEnum); switch(type){ @@ -461,5 +461,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,IceFrontTypeEnum); switch(type){ @@ -589,5 +589,5 @@ icefront=(Icefront*)this->copy(); icefront->element=tria; - icefront->inputs->AddInput(new IntInput(TypeEnum,MacAyeal2dIceFrontEnum)); + icefront->inputs->AddInput(new IntInput(IceFrontTypeEnum,MacAyeal2dIceFrontEnum)); ElementVector* pe=icefront->CreatePVectorDiagnosticMacAyeal2d(); @@ -767,5 +767,5 @@ /*recover type: */ - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,IceFrontTypeEnum); /*Some checks for debugging*/ Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Numericalflux.cpp (revision 14688) @@ -131,5 +131,5 @@ //intialize and add as many inputs per element as requested: this->inputs=new Inputs(); - this->inputs->AddInput(new IntInput(TypeEnum,numericalflux_type)); + this->inputs->AddInput(new IntInput(NumericalfluxTypeEnum,numericalflux_type)); //this->parameters: we still can't point to it, it may not even exist. Configure will handle this. @@ -309,5 +309,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); _assert_(sidlist); _assert_(nodes); @@ -329,5 +329,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); switch(type){ @@ -426,5 +426,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); switch(type){ @@ -579,5 +579,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); switch(type){ @@ -730,5 +730,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); switch(type){ @@ -762,5 +762,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); switch(type){ @@ -856,5 +856,5 @@ int type; - inputs->GetInputValue(&type,TypeEnum); + inputs->GetInputValue(&type,NumericalfluxTypeEnum); switch(type){ Index: /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp =================================================================== --- /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/classes/objects/Loads/Riftfront.cpp (revision 14688) @@ -104,5 +104,5 @@ riftfront_shelf=reCast(iomodel->Data(MaskVertexonfloatingiceEnum)[node1-1]); - this->inputs->AddInput(new IntInput(TypeEnum,riftfront_type)); + this->inputs->AddInput(new IntInput(RiftfrontTypeEnum,riftfront_type)); this->inputs->AddInput(new IntInput(FillEnum,riftfront_fill)); this->inputs->AddInput(new DoubleInput(FrictionEnum,riftfront_friction)); Index: /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/modules/EnumToStringx/EnumToStringx.cpp (revision 14688) @@ -244,4 +244,6 @@ case AdjointSolutionEnum : return "AdjointSolution"; case AnalysisCounterEnum : return "AnalysisCounter"; + case NoneAnalysisEnum : return "NoneAnalysis"; + case DefaultAnalysisEnum : return "DefaultAnalysis"; case BalancethicknessAnalysisEnum : return "BalancethicknessAnalysis"; case BalancethicknessSolutionEnum : return "BalancethicknessSolution"; @@ -263,5 +265,4 @@ case HydrologySolutionEnum : return "HydrologySolution"; case MeltingAnalysisEnum : return "MeltingAnalysis"; - case NoneAnalysisEnum : return "NoneAnalysis"; case PrognosticAnalysisEnum : return "PrognosticAnalysis"; case PrognosticSolutionEnum : return "PrognosticSolution"; @@ -318,4 +319,5 @@ case IntVecParamEnum : return "IntVecParam"; case TransientParamEnum : return "TransientParam"; + case IceFrontTypeEnum : return "IceFrontType"; case MacAyeal2dIceFrontEnum : return "MacAyeal2dIceFront"; case MacAyeal3dIceFrontEnum : return "MacAyeal3dIceFront"; @@ -325,4 +327,5 @@ case NodeEnum : return "Node"; case NumericalfluxEnum : return "Numericalflux"; + case NumericalfluxTypeEnum : return "NumericalfluxType"; case ParamEnum : return "Param"; case L1L2IceFrontEnum : return "L1L2IceFront"; @@ -336,4 +339,5 @@ case VectorParamEnum : return "VectorParam"; case RiftfrontEnum : return "Riftfront"; + case RiftfrontTypeEnum : return "RiftfrontType"; case SegmentEnum : return "Segment"; case SegmentRiftfrontEnum : return "SegmentRiftfront"; @@ -401,5 +405,4 @@ case TemperaturePicardEnum : return "TemperaturePicard"; case ThicknessAbsMisfitEnum : return "ThicknessAbsMisfit"; - case TypeEnum : return "Type"; case VelEnum : return "Vel"; case VelocityEnum : return "Velocity"; Index: /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp =================================================================== --- /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/modules/StringToEnumx/StringToEnumx.cpp (revision 14688) @@ -248,4 +248,6 @@ else if (strcmp(name,"AdjointSolution")==0) return AdjointSolutionEnum; else if (strcmp(name,"AnalysisCounter")==0) return AnalysisCounterEnum; + else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; + else if (strcmp(name,"DefaultAnalysis")==0) return DefaultAnalysisEnum; else if (strcmp(name,"BalancethicknessAnalysis")==0) return BalancethicknessAnalysisEnum; else if (strcmp(name,"BalancethicknessSolution")==0) return BalancethicknessSolutionEnum; @@ -259,10 +261,10 @@ else if (strcmp(name,"DiagnosticHutterAnalysis")==0) return DiagnosticHutterAnalysisEnum; 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,"EnthalpySolution")==0) return EnthalpySolutionEnum; + if (strcmp(name,"DiagnosticVertAnalysis")==0) return DiagnosticVertAnalysisEnum; + else if (strcmp(name,"EnthalpyAnalysis")==0) return EnthalpyAnalysisEnum; + else if (strcmp(name,"EnthalpySolution")==0) return EnthalpySolutionEnum; else if (strcmp(name,"FlaimAnalysis")==0) return FlaimAnalysisEnum; else if (strcmp(name,"FlaimSolution")==0) return FlaimSolutionEnum; @@ -270,5 +272,4 @@ else if (strcmp(name,"HydrologySolution")==0) return HydrologySolutionEnum; else if (strcmp(name,"MeltingAnalysis")==0) return MeltingAnalysisEnum; - else if (strcmp(name,"NoneAnalysis")==0) return NoneAnalysisEnum; else if (strcmp(name,"PrognosticAnalysis")==0) return PrognosticAnalysisEnum; else if (strcmp(name,"PrognosticSolution")==0) return PrognosticSolutionEnum; @@ -325,4 +326,5 @@ else if (strcmp(name,"IntVecParam")==0) return IntVecParamEnum; else if (strcmp(name,"TransientParam")==0) return TransientParamEnum; + else if (strcmp(name,"IceFrontType")==0) return IceFrontTypeEnum; else if (strcmp(name,"MacAyeal2dIceFront")==0) return MacAyeal2dIceFrontEnum; else if (strcmp(name,"MacAyeal3dIceFront")==0) return MacAyeal3dIceFrontEnum; @@ -332,4 +334,5 @@ else if (strcmp(name,"Node")==0) return NodeEnum; else if (strcmp(name,"Numericalflux")==0) return NumericalfluxEnum; + else if (strcmp(name,"NumericalfluxType")==0) return NumericalfluxTypeEnum; else if (strcmp(name,"Param")==0) return ParamEnum; else if (strcmp(name,"L1L2IceFront")==0) return L1L2IceFrontEnum; @@ -343,4 +346,5 @@ else if (strcmp(name,"VectorParam")==0) return VectorParamEnum; else if (strcmp(name,"Riftfront")==0) return RiftfrontEnum; + else if (strcmp(name,"RiftfrontType")==0) return RiftfrontTypeEnum; else if (strcmp(name,"Segment")==0) return SegmentEnum; else if (strcmp(name,"SegmentRiftfront")==0) return SegmentRiftfrontEnum; @@ -380,12 +384,12 @@ else if (strcmp(name,"MassFlux")==0) return MassFluxEnum; else if (strcmp(name,"MaxPenetration")==0) return MaxPenetrationEnum; - else if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; + else stage=4; + } + if(stage==4){ + if (strcmp(name,"MeltingOffset")==0) return MeltingOffsetEnum; 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,"PressurePicard")==0) return PressurePicardEnum; + else if (strcmp(name,"PressurePicard")==0) return PressurePicardEnum; else if (strcmp(name,"QmuPressure")==0) return QmuPressureEnum; else if (strcmp(name,"QmuVx")==0) return QmuVxEnum; @@ -411,5 +415,4 @@ else if (strcmp(name,"TemperaturePicard")==0) return TemperaturePicardEnum; else if (strcmp(name,"ThicknessAbsMisfit")==0) return ThicknessAbsMisfitEnum; - else if (strcmp(name,"Type")==0) return TypeEnum; else if (strcmp(name,"Vel")==0) return VelEnum; else if (strcmp(name,"Velocity")==0) return VelocityEnum; @@ -504,11 +507,11 @@ else if (strcmp(name,"Gradient3")==0) return Gradient3Enum; else if (strcmp(name,"Gradient")==0) return GradientEnum; - 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,"Indexed")==0) return IndexedEnum; + if (strcmp(name,"GroundinglineMigration")==0) return GroundinglineMigrationEnum; + else if (strcmp(name,"Gset")==0) return GsetEnum; + else if (strcmp(name,"Index")==0) return IndexEnum; + else 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/c/shared/Numerics/OptionsFromAnalysis.cpp =================================================================== --- /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 14687) +++ /issm/trunk-jpl/src/c/shared/Numerics/OptionsFromAnalysis.cpp (revision 14688) @@ -21,11 +21,11 @@ /*intermediary: */ - int dummy; - IssmDouble* analyses=NULL; - char** strings=NULL; - char* string=NULL; - int numanalyses; - int found=-1; - int i; + int dummy; + IssmDouble *analyses = NULL; + char **strings = NULL; + char *string = NULL; + int numanalyses; + int found = -1; + int i; numanalyses=0; @@ -37,8 +37,6 @@ /*ok, go through analyses and figure out if it corresponds to our analysis_type: */ - found=-1; for(i=0;i