Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 9787) +++ /issm/trunk/src/c/Makefile.am (revision 9788) @@ -155,6 +155,4 @@ ./objects/Loads/Friction.h\ ./objects/Loads/Friction.cpp\ - ./objects/DakotaPlugin.h\ - ./objects/DakotaPlugin.cpp\ ./objects/Node.h\ ./objects/Node.cpp\ @@ -572,10 +570,6 @@ ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.h\ ./modules/InputUpdateFromConstantx/InputUpdateFromConstantx.cpp\ - ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ - ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.h\ ./modules/InputUpdateFromSolutionx/InputUpdateFromSolutionx.cpp\ - ./modules/DakotaResponsesx/DakotaResponsesx.h\ - ./modules/DakotaResponsesx/DakotaResponsesx.cpp\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.h\ ./modules/GetSolutionFromInputsx/GetSolutionFromInputsx.cpp\ @@ -584,6 +578,4 @@ ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.h\ ./modules/InputUpdateFromVectorx/InputUpdateFromVectorx.cpp\ - ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\ - ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\ ./modules/InputArtificialNoisex/InputArtificialNoisex.h\ ./modules/InputArtificialNoisex/InputArtificialNoisex.cpp\ @@ -680,9 +672,4 @@ ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.cpp\ ./modules/PropagateFlagsFromConnectivityx/PropagateFlagsFromConnectivityx.h\ - ./modules/Dakotax/Dakotax.h\ - ./modules/Dakotax/Dakotax.cpp\ - ./modules/Dakotax/SpawnCore.cpp\ - ./modules/Dakotax/SpawnCoreSerial.cpp\ - ./modules/Dakotax/DescriptorIndex.cpp\ ./modules/InputToResultx/InputToResultx.cpp\ ./modules/InputToResultx/InputToResultx.h\ @@ -710,4 +697,28 @@ endif +#}}} +#DAKOTA sources {{{1 +if DAKOTA +libISSM_a_SOURCES += ./objects/DakotaPlugin.h\ + ./objects/DakotaPlugin.cpp\ + ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ + ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.cpp\ + ./modules/DakotaResponsesx/DakotaResponsesx.h\ + ./modules/DakotaResponsesx/DakotaResponsesx.cpp\ + ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.h\ + ./modules/InputUpdateFromVectorDakotax/InputUpdateFromVectorDakotax.cpp\ + ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\ + ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h\ + ./modules/Dakotax/Dakotax.h\ + ./modules/Dakotax/Dakotax.cpp\ + ./modules/Dakotax/DakotaMPI_Bcast.cpp\ + ./modules/Dakotax/DakotaFree.cpp\ + ./modules/Dakotax/SpawnCore.cpp\ + ./modules/Dakotax/SpawnCoreParallel.cpp\ + ./modules/Dakotax/DescriptorIndex.cpp\ + ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\ + ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\ + ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h +endif #}}} Index: /issm/trunk/src/mex/Makefile.am =================================================================== --- /issm/trunk/src/mex/Makefile.am (revision 9787) +++ /issm/trunk/src/mex/Makefile.am (revision 9788) @@ -2,4 +2,5 @@ EXEEXT=$(MEXEXT) +#Bin programs {{{1 if NOSERIAL bin_PROGRAMS = @@ -20,5 +21,4 @@ CostFunction \ CreateNodalConstraints\ - DakotaResponses\ Echo\ ElementConnectivity\ @@ -60,5 +60,4 @@ PropagateFlagsFromConnectivity\ ProcessParams\ - Dakota\ Reduceload\ Reducevectorgtos\ @@ -80,5 +79,4 @@ TriMeshRefine\ InputUpdateFromConstant\ - InputUpdateFromDakota\ InputUpdateFromSolution\ InputUpdateFromVector\ @@ -87,7 +85,16 @@ VerticesDof -endif - - +endif +#}}} +#Dakota programs {{{1 +if NOSERIAL +bin_PROGRAMS += +else +bin_PROGRAMS += DakotaResponses\ + Dakota\ + InputUpdateFromDakota +endif +#}}} +#Flags and libraries {{{1 LDADD = $(TRIANGLELIB) ../c/libISSM.a $(PETSCLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) @@ -108,6 +115,8 @@ endif -AM_CXXFLAGS += $(CXXOPTFLAGS) - +AM_CXXFLAGS += $(CXXOPTFLAGS) + +#}}} +#Bin sources {{{1 AddExternalResult_SOURCES = AddExternalResult/AddExternalResult.cpp\ AddExternalResult/AddExternalResult.h @@ -161,193 +170,194 @@ NodesDof/NodesDof.h +Echo_SOURCES = Echo/Echo.cpp\ + Echo/Echo.h + +ElementConnectivity_SOURCES = ElementConnectivity/ElementConnectivity.cpp\ + ElementConnectivity/ElementConnectivity.h + +EnumToString_SOURCES = EnumToString/EnumToString.cpp\ + EnumToString/EnumToString.h + +StringToEnum_SOURCES = StringToEnum/StringToEnum.cpp\ + StringToEnum/StringToEnum.h + +GetSolutionFromInputs_SOURCES = GetSolutionFromInputs/GetSolutionFromInputs.cpp\ + GetSolutionFromInputs/GetSolutionFromInputs.h + +GetVectorFromInputs_SOURCES = GetVectorFromInputs/GetVectorFromInputs.cpp\ + GetVectorFromInputs/GetVectorFromInputs.h + +Gradj_SOURCES = Gradj/Gradj.cpp\ + Gradj/Gradj.h + +Test_SOURCES = Test/Test.cpp\ + Test/Test.h + +HoleFiller_SOURCES = HoleFiller/HoleFiller.cpp\ + HoleFiller/HoleFiller.h + +InputDuplicate_SOURCES = InputDuplicate/InputDuplicate.cpp\ + InputDuplicate/InputDuplicate.h + +InputScale_SOURCES = InputScale/InputScale.cpp\ + InputScale/InputScale.h + +InputToResult_SOURCES = InputToResult/InputToResult.cpp\ + InputToResult/InputToResult.h + +InternalFront_SOURCES = InternalFront/InternalFront.cpp\ + InternalFront/InternalFront.h + +InterpFromGridToMesh_SOURCES = InterpFromGridToMesh/InterpFromGridToMesh.cpp\ + InterpFromGridToMesh/InterpFromGridToMesh.h + +InterpFromMeshToMesh2d_SOURCES = InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\ + InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h + +InterpFromMeshToMesh3d_SOURCES = InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\ + InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h + +InterpFromMeshToGrid_SOURCES = InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\ + InterpFromMeshToGrid/InterpFromMeshToGrid.h + +InterpFromMesh2d_SOURCES = InterpFromMesh2d/InterpFromMesh2d.cpp\ + InterpFromMesh2d/InterpFromMesh2d.h + +KMLFileRead_SOURCES = KMLMeshWrite/KMLFileRead.cpp\ + KMLMeshWrite/KMLFileRead.h + +KMLMeshWrite_SOURCES = KMLMeshWrite/KMLMeshWrite.cpp\ + KMLMeshWrite/KMLMeshWrite.h + +KMLOverlay_SOURCES = KMLOverlay/KMLOverlay.cpp\ + KMLOverlay/KMLOverlay.h + +Xy2ll_SOURCES = Xy2ll/Xy2ll.cpp\ + Xy2ll/Xy2ll.h + +Ll2xy_SOURCES = Ll2xy/Ll2xy.cpp\ + Ll2xy/Ll2xy.h + +Exp2Kml_SOURCES = Exp2Kml/Exp2Kml.cpp\ + Exp2Kml/Exp2Kml.h + +Kml2Exp_SOURCES = Kml2Exp/Kml2Exp.cpp\ + Kml2Exp/Kml2Exp.h + +AverageFilter_SOURCES = AverageFilter/AverageFilter.cpp\ + AverageFilter/AverageFilter.h + +Mergesolutionfromftog_SOURCES = Mergesolutionfromftog/Mergesolutionfromftog.cpp\ + Mergesolutionfromftog/Mergesolutionfromftog.h + +MeshPartition_SOURCES = MeshPartition/MeshPartition.cpp\ + MeshPartition/MeshPartition.h + +MeshProfileIntersection_SOURCES = MeshProfileIntersection/MeshProfileIntersection.cpp\ + MeshProfileIntersection/MeshProfileIntersection.h + +ModelProcessor_SOURCES = ModelProcessor/ModelProcessor.cpp \ + ModelProcessor/ModelProcessor.h + +NodeConnectivity_SOURCES = NodeConnectivity/NodeConnectivity.cpp\ + NodeConnectivity/NodeConnectivity.h + +Orth_SOURCES = Orth/Orth.cpp\ + Orth/Orth.h + +OutputResults_SOURCES = OutputResults/OutputResults.cpp\ + OutputResults/OutputResults.h + +ConstraintsState_SOURCES = ConstraintsState/ConstraintsState.cpp\ + ConstraintsState/ConstraintsState.h + +PointCloudFindNeighbors_SOURCES = PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\ + PointCloudFindNeighbors/PointCloudFindNeighbors.h + +ProcessParams_SOURCES = ProcessParams/ProcessParams.cpp\ + ProcessParams/ProcessParams.h + +PropagateFlagsFromConnectivity_SOURCES = PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\ + PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h + +Reduceload_SOURCES = Reduceload/Reduceload.cpp\ + Reduceload/Reduceload.h + +Reducevectorgtos_SOURCES = Reducevectorgtos/Reducevectorgtos.cpp\ + Reducevectorgtos/Reducevectorgtos.h + +Reducevectorgtof_SOURCES = Reducevectorgtof/Reducevectorgtof.cpp\ + Reducevectorgtof/Reducevectorgtof.h + +Response_SOURCES = Response/Response.cpp\ + Response/Response.h + +Scotch_SOURCES = Scotch/Scotch.cpp\ + Scotch/Scotch.h + +Solver_SOURCES = Solver/Solver.cpp\ + Solver/Solver.h + +SparseToVector_SOURCES = SparseToVector/SparseToVector.cpp\ + SparseToVector/SparseToVector.h + +SpcNodes_SOURCES = SpcNodes/SpcNodes.cpp\ + SpcNodes/SpcNodes.h + +UpdateConstraints_SOURCES = UpdateConstraints/UpdateConstraints.cpp\ + UpdateConstraints/UpdateConstraints.h + +SystemMatrices_SOURCES = SystemMatrices/SystemMatrices.cpp\ + SystemMatrices/SystemMatrices.h + +SurfaceArea_SOURCES = SurfaceArea/SurfaceArea.cpp\ + SurfaceArea/SurfaceArea.h + +TimeAdapt_SOURCES = TimeAdapt/TimeAdapt.cpp\ + TimeAdapt/TimeAdapt.h + +TriaSearch_SOURCES = TriaSearch/TriaSearch.cpp\ + TriaSearch/TriaSearch.h + +TriMesh_SOURCES = TriMesh/TriMesh.cpp\ + TriMesh/TriMesh.h + +TriMeshNoDensity_SOURCES = TriMeshNoDensity/TriMeshNoDensity.cpp\ + TriMeshNoDensity/TriMeshNoDensity.h + +TriMeshProcessRifts_SOURCES = TriMeshProcessRifts/TriMeshProcessRifts.cpp\ + TriMeshProcessRifts/TriMeshProcessRifts.h + +TriMeshRefine_SOURCES = TriMeshRefine/TriMeshRefine.cpp\ + TriMeshRefine/TriMeshRefine.h + +InputUpdateFromConstant_SOURCES = InputUpdateFromConstant/InputUpdateFromConstant.cpp\ + InputUpdateFromConstant/InputUpdateFromConstant.h + +InputUpdateFromSolution_SOURCES = InputUpdateFromSolution/InputUpdateFromSolution.cpp\ + InputUpdateFromSolution/InputUpdateFromSolution.h + +InputUpdateFromVector_SOURCES = InputUpdateFromVector/InputUpdateFromVector.cpp\ + InputUpdateFromVector/InputUpdateFromVector.h + +UpdateVertexPositions_SOURCES = UpdateVertexPositions/UpdateVertexPositions.cpp\ + UpdateVertexPositions/UpdateVertexPositions.h + +UpdateDynamicConstraints_SOURCES = UpdateDynamicConstraints/UpdateDynamicConstraints.cpp\ + UpdateDynamicConstraints/UpdateDynamicConstraints.h + +ParsePetscOptions_SOURCES = ParsePetscOptions/ParsePetscOptions.cpp\ + ParsePetscOptions/ParsePetscOptions.h + +VerticesDof_SOURCES = VerticesDof/VerticesDof.cpp\ + VerticesDof/VerticesDof.h + +#}}} +#Dakota sources {{{1 DakotaResponses_SOURCES = DakotaResponses/DakotaResponses.cpp\ DakotaResponses/DakotaResponses.h - -Echo_SOURCES = Echo/Echo.cpp\ - Echo/Echo.h - -ElementConnectivity_SOURCES = ElementConnectivity/ElementConnectivity.cpp\ - ElementConnectivity/ElementConnectivity.h - -EnumToString_SOURCES = EnumToString/EnumToString.cpp\ - EnumToString/EnumToString.h - -StringToEnum_SOURCES = StringToEnum/StringToEnum.cpp\ - StringToEnum/StringToEnum.h - -GetSolutionFromInputs_SOURCES = GetSolutionFromInputs/GetSolutionFromInputs.cpp\ - GetSolutionFromInputs/GetSolutionFromInputs.h - -GetVectorFromInputs_SOURCES = GetVectorFromInputs/GetVectorFromInputs.cpp\ - GetVectorFromInputs/GetVectorFromInputs.h - -Gradj_SOURCES = Gradj/Gradj.cpp\ - Gradj/Gradj.h - -Test_SOURCES = Test/Test.cpp\ - Test/Test.h - -HoleFiller_SOURCES = HoleFiller/HoleFiller.cpp\ - HoleFiller/HoleFiller.h - -InputDuplicate_SOURCES = InputDuplicate/InputDuplicate.cpp\ - InputDuplicate/InputDuplicate.h - -InputScale_SOURCES = InputScale/InputScale.cpp\ - InputScale/InputScale.h - -InputToResult_SOURCES = InputToResult/InputToResult.cpp\ - InputToResult/InputToResult.h - -InternalFront_SOURCES = InternalFront/InternalFront.cpp\ - InternalFront/InternalFront.h - -InterpFromGridToMesh_SOURCES = InterpFromGridToMesh/InterpFromGridToMesh.cpp\ - InterpFromGridToMesh/InterpFromGridToMesh.h - -InterpFromMeshToMesh2d_SOURCES = InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.cpp\ - InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h - -InterpFromMeshToMesh3d_SOURCES = InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.cpp\ - InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h - -InterpFromMeshToGrid_SOURCES = InterpFromMeshToGrid/InterpFromMeshToGrid.cpp\ - InterpFromMeshToGrid/InterpFromMeshToGrid.h - -InterpFromMesh2d_SOURCES = InterpFromMesh2d/InterpFromMesh2d.cpp\ - InterpFromMesh2d/InterpFromMesh2d.h - -KMLFileRead_SOURCES = KMLMeshWrite/KMLFileRead.cpp\ - KMLMeshWrite/KMLFileRead.h - -KMLMeshWrite_SOURCES = KMLMeshWrite/KMLMeshWrite.cpp\ - KMLMeshWrite/KMLMeshWrite.h - -KMLOverlay_SOURCES = KMLOverlay/KMLOverlay.cpp\ - KMLOverlay/KMLOverlay.h - -Xy2ll_SOURCES = Xy2ll/Xy2ll.cpp\ - Xy2ll/Xy2ll.h - -Ll2xy_SOURCES = Ll2xy/Ll2xy.cpp\ - Ll2xy/Ll2xy.h - -Exp2Kml_SOURCES = Exp2Kml/Exp2Kml.cpp\ - Exp2Kml/Exp2Kml.h - -Kml2Exp_SOURCES = Kml2Exp/Kml2Exp.cpp\ - Kml2Exp/Kml2Exp.h - -AverageFilter_SOURCES = AverageFilter/AverageFilter.cpp\ - AverageFilter/AverageFilter.h - -Mergesolutionfromftog_SOURCES = Mergesolutionfromftog/Mergesolutionfromftog.cpp\ - Mergesolutionfromftog/Mergesolutionfromftog.h - -MeshPartition_SOURCES = MeshPartition/MeshPartition.cpp\ - MeshPartition/MeshPartition.h - -MeshProfileIntersection_SOURCES = MeshProfileIntersection/MeshProfileIntersection.cpp\ - MeshProfileIntersection/MeshProfileIntersection.h - -ModelProcessor_SOURCES = ModelProcessor/ModelProcessor.cpp \ - ModelProcessor/ModelProcessor.h - -NodeConnectivity_SOURCES = NodeConnectivity/NodeConnectivity.cpp\ - NodeConnectivity/NodeConnectivity.h - -Orth_SOURCES = Orth/Orth.cpp\ - Orth/Orth.h - -OutputResults_SOURCES = OutputResults/OutputResults.cpp\ - OutputResults/OutputResults.h - -ConstraintsState_SOURCES = ConstraintsState/ConstraintsState.cpp\ - ConstraintsState/ConstraintsState.h - -PointCloudFindNeighbors_SOURCES = PointCloudFindNeighbors/PointCloudFindNeighbors.cpp\ - PointCloudFindNeighbors/PointCloudFindNeighbors.h - -ProcessParams_SOURCES = ProcessParams/ProcessParams.cpp\ - ProcessParams/ProcessParams.h - -PropagateFlagsFromConnectivity_SOURCES = PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.cpp\ - PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h - Dakota_SOURCES = Dakota/Dakota.cpp\ Dakota/Dakota.h - -Reduceload_SOURCES = Reduceload/Reduceload.cpp\ - Reduceload/Reduceload.h - -Reducevectorgtos_SOURCES = Reducevectorgtos/Reducevectorgtos.cpp\ - Reducevectorgtos/Reducevectorgtos.h - -Reducevectorgtof_SOURCES = Reducevectorgtof/Reducevectorgtof.cpp\ - Reducevectorgtof/Reducevectorgtof.h - -Response_SOURCES = Response/Response.cpp\ - Response/Response.h - -Scotch_SOURCES = Scotch/Scotch.cpp\ - Scotch/Scotch.h - -Solver_SOURCES = Solver/Solver.cpp\ - Solver/Solver.h - -SparseToVector_SOURCES = SparseToVector/SparseToVector.cpp\ - SparseToVector/SparseToVector.h - -SpcNodes_SOURCES = SpcNodes/SpcNodes.cpp\ - SpcNodes/SpcNodes.h - -UpdateConstraints_SOURCES = UpdateConstraints/UpdateConstraints.cpp\ - UpdateConstraints/UpdateConstraints.h - -SystemMatrices_SOURCES = SystemMatrices/SystemMatrices.cpp\ - SystemMatrices/SystemMatrices.h - -SurfaceArea_SOURCES = SurfaceArea/SurfaceArea.cpp\ - SurfaceArea/SurfaceArea.h - -TimeAdapt_SOURCES = TimeAdapt/TimeAdapt.cpp\ - TimeAdapt/TimeAdapt.h - -TriaSearch_SOURCES = TriaSearch/TriaSearch.cpp\ - TriaSearch/TriaSearch.h - -TriMesh_SOURCES = TriMesh/TriMesh.cpp\ - TriMesh/TriMesh.h - -TriMeshNoDensity_SOURCES = TriMeshNoDensity/TriMeshNoDensity.cpp\ - TriMeshNoDensity/TriMeshNoDensity.h - -TriMeshProcessRifts_SOURCES = TriMeshProcessRifts/TriMeshProcessRifts.cpp\ - TriMeshProcessRifts/TriMeshProcessRifts.h - -TriMeshRefine_SOURCES = TriMeshRefine/TriMeshRefine.cpp\ - TriMeshRefine/TriMeshRefine.h - -InputUpdateFromConstant_SOURCES = InputUpdateFromConstant/InputUpdateFromConstant.cpp\ - InputUpdateFromConstant/InputUpdateFromConstant.h - InputUpdateFromDakota_SOURCES = InputUpdateFromDakota/InputUpdateFromDakota.cpp\ InputUpdateFromDakota/InputUpdateFromDakota.h - -InputUpdateFromSolution_SOURCES = InputUpdateFromSolution/InputUpdateFromSolution.cpp\ - InputUpdateFromSolution/InputUpdateFromSolution.h - -InputUpdateFromVector_SOURCES = InputUpdateFromVector/InputUpdateFromVector.cpp\ - InputUpdateFromVector/InputUpdateFromVector.h - -UpdateVertexPositions_SOURCES = UpdateVertexPositions/UpdateVertexPositions.cpp\ - UpdateVertexPositions/UpdateVertexPositions.h - -UpdateDynamicConstraints_SOURCES = UpdateDynamicConstraints/UpdateDynamicConstraints.cpp\ - UpdateDynamicConstraints/UpdateDynamicConstraints.h - -ParsePetscOptions_SOURCES = ParsePetscOptions/ParsePetscOptions.cpp\ - ParsePetscOptions/ParsePetscOptions.h - -VerticesDof_SOURCES = VerticesDof/VerticesDof.cpp\ - VerticesDof/VerticesDof.h +#}}}