Index: /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp (revision 3700) +++ /issm/trunk/src/c/EnumDefinitions/EnumAsString.cpp (revision 3701) @@ -356,4 +356,6 @@ case PenaltyOffsetEnum : return "PenaltyOffset"; + case ConstantEnum : + return "Constant"; case OutputFileNameEnum : return "OutputFileName"; Index: /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h =================================================================== --- /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 3700) +++ /issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h (revision 3701) @@ -213,5 +213,5 @@ StabilizeConstraintsEnum, PenaltyOffsetEnum, - ConstantEnum + ConstantEnum, /*}}}*/ /*Parameters{{{1*/ Index: /issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp =================================================================== --- /issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp (revision 3700) +++ /issm/trunk/src/c/EnumDefinitions/StringAsEnum.cpp (revision 3701) @@ -184,4 +184,5 @@ else if (strcmp(name,"StabilizeConstraints")==0) return StabilizeConstraintsEnum; else if (strcmp(name,"PenaltyOffset")==0) return PenaltyOffsetEnum; + else if (strcmp(name,"Constant")==0) return ConstantEnum; else if (strcmp(name,"OutputFileName")==0) return OutputFileNameEnum; else if (strcmp(name,"Dim")==0) return DimEnum; Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 3700) +++ /issm/trunk/src/c/Makefile.am (revision 3701) @@ -223,12 +223,14 @@ ./EnumDefinitions/EnumDefinitions.h\ ./EnumDefinitions/EnumDefinitions.cpp\ + ./EnumDefinitions/EnumAsString.cpp\ + ./EnumDefinitions/StringAsEnum.cpp\ ./ModelProcessorx/ModelProcessorx.h\ ./ModelProcessorx/Partitioning.cpp\ ./ModelProcessorx/CreateDataSets.cpp\ ./ModelProcessorx/CreateParameters.cpp\ + ./ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\ ./ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\ ./ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \ ./ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\ - ./ModelProcessorx/DiagnosticHoriz/CreateParametersDiagnosticHoriz.cpp\ ./ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\ ./ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \ @@ -247,29 +249,22 @@ ./ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\ ./ModelProcessorx/Thermal/CreateLoadsThermal.cpp\ - ./ModelProcessorx/Thermal/CreateParametersThermal.cpp\ ./ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\ ./ModelProcessorx/Melting/CreateConstraintsMelting.cpp\ ./ModelProcessorx/Melting/CreateLoadsMelting.cpp\ - ./ModelProcessorx/Melting/CreateParametersMelting.cpp\ ./ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\ ./ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\ ./ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\ - ./ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp\ ./ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\ ./ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\ ./ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\ - ./ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp\ ./ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\ ./ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\ ./ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\ - ./ModelProcessorx/Balancedthickness/CreateParametersBalancedthickness.cpp\ ./ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\ ./ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\ ./ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\ - ./ModelProcessorx/Balancedthickness2/CreateParametersBalancedthickness2.cpp\ ./ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\ ./ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\ ./ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\ - ./ModelProcessorx/Balancedvelocities/CreateParametersBalancedvelocities.cpp\ ./ModelProcessorx/Qmu/CreateParametersQmu.cpp\ ./Dofx/Dofx.h\ @@ -451,5 +446,5 @@ libpISSM_a_SOURCES = ./objects/objects.h\ ./objects/Object.h\ - ./objects/BamgGeom.h\ + ./objects/Bamg/BamgGeom.h\ ./objects/Bamg/BamgGeom.cpp\ ./objects/Bamg/BamgMesh.h\ @@ -648,12 +643,14 @@ ./EnumDefinitions/EnumDefinitions.h\ ./EnumDefinitions/EnumDefinitions.cpp\ + ./EnumDefinitions/EnumAsString.cpp\ + ./EnumDefinitions/StringAsEnum.cpp\ ./ModelProcessorx/ModelProcessorx.h\ ./ModelProcessorx/Partitioning.cpp\ ./ModelProcessorx/CreateDataSets.cpp\ ./ModelProcessorx/CreateParameters.cpp\ + ./ModelProcessorx/CreateSingleNodeToElementConnectivity.cpp\ ./ModelProcessorx/DiagnosticHoriz/CreateElementsNodesAndMaterialsDiagnosticHoriz.cpp\ ./ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \ ./ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\ - ./ModelProcessorx/DiagnosticHoriz/CreateParametersDiagnosticHoriz.cpp\ ./ModelProcessorx/DiagnosticVert/CreateElementsNodesAndMaterialsDiagnosticVert.cpp\ ./ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \ @@ -672,29 +669,22 @@ ./ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\ ./ModelProcessorx/Thermal/CreateLoadsThermal.cpp\ - ./ModelProcessorx/Thermal/CreateParametersThermal.cpp\ ./ModelProcessorx/Melting/CreateElementsNodesAndMaterialsMelting.cpp\ ./ModelProcessorx/Melting/CreateConstraintsMelting.cpp\ ./ModelProcessorx/Melting/CreateLoadsMelting.cpp\ - ./ModelProcessorx/Melting/CreateParametersMelting.cpp\ ./ModelProcessorx/Prognostic/CreateElementsNodesAndMaterialsPrognostic.cpp\ ./ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\ ./ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp\ - ./ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp\ ./ModelProcessorx/Prognostic2/CreateElementsNodesAndMaterialsPrognostic2.cpp\ ./ModelProcessorx/Prognostic2/CreateConstraintsPrognostic2.cpp\ ./ModelProcessorx/Prognostic2/CreateLoadsPrognostic2.cpp\ - ./ModelProcessorx/Prognostic2/CreateParametersPrognostic2.cpp\ ./ModelProcessorx/Balancedthickness/CreateElementsNodesAndMaterialsBalancedthickness.cpp\ ./ModelProcessorx/Balancedthickness/CreateConstraintsBalancedthickness.cpp\ ./ModelProcessorx/Balancedthickness/CreateLoadsBalancedthickness.cpp\ - ./ModelProcessorx/Balancedthickness/CreateParametersBalancedthickness.cpp\ ./ModelProcessorx/Balancedthickness2/CreateElementsNodesAndMaterialsBalancedthickness2.cpp\ ./ModelProcessorx/Balancedthickness2/CreateConstraintsBalancedthickness2.cpp\ ./ModelProcessorx/Balancedthickness2/CreateLoadsBalancedthickness2.cpp\ - ./ModelProcessorx/Balancedthickness2/CreateParametersBalancedthickness2.cpp\ ./ModelProcessorx/Balancedvelocities/CreateElementsNodesAndMaterialsBalancedvelocities.cpp\ ./ModelProcessorx/Balancedvelocities/CreateConstraintsBalancedvelocities.cpp\ ./ModelProcessorx/Balancedvelocities/CreateLoadsBalancedvelocities.cpp\ - ./ModelProcessorx/Balancedvelocities/CreateParametersBalancedvelocities.cpp\ ./ModelProcessorx/Qmu/CreateParametersQmu.cpp\ ./Dofx/Dofx.h\ Index: sm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateParametersBalancedthickness.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Balancedthickness/CreateParametersBalancedthickness.cpp (revision 3700) +++ (revision ) @@ -1,13 +1,0 @@ - /* \brief driver for creating parameters dataset, for prognostic analysis. - */ - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../ModelProcessorx.h" - -void CreateParametersBalancedthickness(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -} Index: sm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateParametersBalancedthickness2.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Balancedthickness2/CreateParametersBalancedthickness2.cpp (revision 3700) +++ (revision ) @@ -1,14 +1,0 @@ -/*!\file: CreateParametersPrognostic.cpp - * \brief driver for creating parameters dataset, for prognostic analysis. - */ - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../ModelProcessorx.h" - -void CreateParametersBalancedthickness2(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -} Index: sm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateParametersBalancedvelocities.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Balancedvelocities/CreateParametersBalancedvelocities.cpp (revision 3700) +++ (revision ) @@ -1,14 +1,0 @@ -/*!\file: CreateParametersBalancedvelocities.cpp - * \brief driver for creating parameters dataset, for prognostic analysis. - */ - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../ModelProcessorx.h" - -void CreateParametersBalancedvelocities(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -} Index: sm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateParametersDiagnosticHoriz.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/DiagnosticHoriz/CreateParametersDiagnosticHoriz.cpp (revision 3700) +++ (revision ) @@ -1,14 +1,0 @@ -/*!\file: CreateParametersDiagnosticHoriz.cpp - * \brief driver for creating parameters dataset, for diagnostic horiz analysis. - */ - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../ModelProcessorx.h" - -void CreateParametersDiagnosticHoriz(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -} Index: sm/trunk/src/c/ModelProcessorx/Melting/CreateParametersMelting.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Melting/CreateParametersMelting.cpp (revision 3700) +++ (revision ) @@ -1,14 +1,0 @@ -/*!\file: CreateParametersMelting.cpp - * \brief driver for creating parameters dataset, for diagnostic horiz analysis. - */ - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../ModelProcessorx.h" - -void CreateParametersMelting(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -} Index: /issm/trunk/src/c/ModelProcessorx/ModelProcessorx.h =================================================================== --- /issm/trunk/src/c/ModelProcessorx/ModelProcessorx.h (revision 3700) +++ /issm/trunk/src/c/ModelProcessorx/ModelProcessorx.h (revision 3701) @@ -18,5 +18,4 @@ void CreateConstraintsDiagnosticHoriz(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsDiagnosticHoriz(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersDiagnosticHoriz(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); /*diagnostic vertical*/ @@ -47,5 +46,4 @@ void CreateConstraintsThermal(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsThermal(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersThermal(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); /*melting:*/ @@ -53,5 +51,4 @@ void CreateConstraintsMelting(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsMelting(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersMelting(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); /*prognostic:*/ @@ -59,5 +56,4 @@ void CreateConstraintsPrognostic(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsPrognostic(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersPrognostic(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); /*prognostic2:*/ @@ -65,5 +61,4 @@ void CreateConstraintsPrognostic2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsPrognostic2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersPrognostic2(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); /*balancedthickness:*/ @@ -71,10 +66,8 @@ void CreateConstraintsBalancedthickness(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsBalancedthickness(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersBalancedthickness(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateElementsNodesAndMaterialsBalancedthickness2(DataSet** pelements,DataSet** pnodes,DataSet** pvertices, DataSet** pmaterials, IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateConstraintsBalancedthickness2(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsBalancedthickness2(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersBalancedthickness2(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); @@ -83,5 +76,4 @@ void CreateConstraintsBalancedvelocities(DataSet** pconstraints,IoModel* iomodel,ConstDataHandle iomodel_handle); void CreateLoadsBalancedvelocities(DataSet** ploads, IoModel* iomodel, ConstDataHandle iomodel_handle); -void CreateParametersBalancedvelocities(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle); /*qmu: */ Index: sm/trunk/src/c/ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Prognostic/CreateParametersPrognostic.cpp (revision 3700) +++ (revision ) @@ -1,15 +1,0 @@ -/*!\file: CreateParametersPrognostic.cpp - * \brief driver for creating parameters dataset, for prognostic analysis. - */ - - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../ModelProcessorx.h" - -void CreateParametersPrognostic(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -} Index: sm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp =================================================================== --- /issm/trunk/src/c/ModelProcessorx/Thermal/CreateParametersThermal.cpp (revision 3700) +++ (revision ) @@ -1,15 +1,0 @@ -/*!\file: CreateParametersThermal.cpp - * \brief driver for creating parameters dataset, for diagnostic horiz analysis. - */ - -#include "../../DataSet/DataSet.h" -#include "../../toolkits/toolkits.h" -#include "../../EnumDefinitions/EnumDefinitions.h" -#include "../../objects/objects.h" -#include "../../shared/shared.h" -#include "../../include/macros.h" -#include "../ModelProcessorx.h" - -void CreateParametersThermal(Parameters** pparameters,IoModel* iomodel,ConstDataHandle iomodel_handle){ - -}