Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 10307) +++ /issm/trunk/src/c/Makefile.am (revision 10308) @@ -16,10 +16,9 @@ endif endif - #}}} #Our sources #Core sources{{{1 -core_sources = ./include/macros.h\ +core_sources = ./include/macros.h\ ./include/typedefs.h\ ./include/types.h\ @@ -349,5 +348,5 @@ #}}} #DAKOTA sources {{{1 -dakota_sources = ./objects/DakotaPlugin.h\ +dakota_sources = ./objects/DakotaPlugin.h\ ./objects/DakotaPlugin.cpp\ ./modules/InputUpdateFromDakotax/InputUpdateFromDakotax.h\ @@ -364,28 +363,27 @@ ./modules/Dakotax/DakotaFree.cpp\ ./modules/Dakotax/SpawnCore.cpp\ - ./modules/Dakotax/SpawnCoreSerial.cpp\ ./modules/Dakotax/DescriptorIndex.cpp\ ./modules/AverageOntoPartitionx/AverageOntoPartitionx.cpp\ ./modules/ModelProcessorx/Qmu/CreateParametersQmu.cpp\ ./modules/AverageOntoPartitionx/AverageOntoPartitionx.h +dakota_psources= ./modules/Dakotax/SpawnCoreParallel.cpp #}}} #Transient sources {{{1 -transient_sources = ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp -transient_psources = ./solutions/transient_core.cpp +transient_sources = ./modules/ModelProcessorx/Transient/UpdateElementsTransient.cpp +transient_psources = ./solutions/transient_core.cpp #}}} #Steadystate sources {{{1 steadystate_psources = ./solutions/steadystate_core.cpp\ - ./solutions/steadystateconvergence.cpp + ./solutions/steadystateconvergence.cpp #}}} #Prognostic sources {{{1 -prognostic_sources = ./modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp\ - ./modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp\ - ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\ - ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp -prognostic_psources = ./solutions/prognostic_core.cpp - +prognostic_sources = ./modules/ModelProcessorx/Prognostic/UpdateElementsPrognostic.cpp\ + ./modules/ModelProcessorx/Prognostic/CreateNodesPrognostic.cpp\ + ./modules/ModelProcessorx/Prognostic/CreateConstraintsPrognostic.cpp\ + ./modules/ModelProcessorx/Prognostic/CreateLoadsPrognostic.cpp +prognostic_psources = ./solutions/prognostic_core.cpp #}}} #Thermal sources {{{1 -thermal_sources = ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\ +thermal_sources = ./modules/ModelProcessorx/Thermal/UpdateElementsThermal.cpp\ ./modules/ModelProcessorx/Thermal/CreateNodesThermal.cpp\ ./modules/ModelProcessorx/Thermal/CreateConstraintsThermal.cpp\ @@ -403,11 +401,11 @@ ./modules/ResetConstraintsx/ThermalConstraintsReset.cpp -thermal_psources = ./solutions/thermal_core.cpp\ - ./solutions/thermal_core_step.cpp\ - ./solutions/enthalpy_core.cpp\ - ./solvers/solver_thermal_nonlinear.cpp +thermal_psources = ./solutions/thermal_core.cpp\ + ./solutions/thermal_core_step.cpp\ + ./solutions/enthalpy_core.cpp\ + ./solvers/solver_thermal_nonlinear.cpp #}}} #Control sources {{{1 -control_sources = ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp\ +control_sources= ./modules/ControlInputGetGradientx/ControlInputGetGradientx.cpp\ ./modules/ControlInputGetGradientx/ControlInputGetGradientx.h\ ./modules/ControlInputSetGradientx/ControlInputSetGradientx.cpp\ @@ -449,5 +447,5 @@ ./shared/Numerics/OptFunc.cpp -control_psources = ./solutions/control_core.cpp\ +control_psources=./solutions/control_core.cpp\ ./solutions/controltao_core.cpp\ ./solutions/controlrestart.cpp\ @@ -462,67 +460,67 @@ #}}} #Hydrology sources {{{1 -hydrology_sources = ./modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp\ - ./modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp\ - ./modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp\ - ./modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp +hydrology_sources = ./modules/ModelProcessorx/Hydrology/UpdateElementsHydrology.cpp\ + ./modules/ModelProcessorx/Hydrology/CreateNodesHydrology.cpp\ + ./modules/ModelProcessorx/Hydrology/CreateConstraintsHydrology.cpp\ + ./modules/ModelProcessorx/Hydrology/CreateLoadsHydrology.cpp hydrology_psources = ./solutions/hydrology_core.cpp\ - ./solutions/hydrology_core_step.cpp + ./solutions/hydrology_core_step.cpp #}}} #Diagnostic sources {{{1 diagnostic_sources = ./modules/ModelProcessorx/DiagnosticHoriz/UpdateElementsDiagnosticHoriz.cpp\ - ./modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp \ - ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \ - ./modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\ - ./modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp\ - ./modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp \ - ./modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \ - ./modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\ - ./modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp\ - ./modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp \ - ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \ - ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp -diagnostic_psources = ./solutions/diagnostic_core.cpp\ - ./solvers/solver_stokescoupling_nonlinear.cpp + ./modules/ModelProcessorx/DiagnosticHoriz/CreateNodesDiagnosticHoriz.cpp \ + ./modules/ModelProcessorx/DiagnosticHoriz/CreateConstraintsDiagnosticHoriz.cpp \ + ./modules/ModelProcessorx/DiagnosticHoriz/CreateLoadsDiagnosticHoriz.cpp\ + ./modules/ModelProcessorx/DiagnosticVert/UpdateElementsDiagnosticVert.cpp\ + ./modules/ModelProcessorx/DiagnosticVert/CreateNodesDiagnosticVert.cpp \ + ./modules/ModelProcessorx/DiagnosticVert/CreateConstraintsDiagnosticVert.cpp \ + ./modules/ModelProcessorx/DiagnosticVert/CreateLoadsDiagnosticVert.cpp\ + ./modules/ModelProcessorx/DiagnosticHutter/UpdateElementsDiagnosticHutter.cpp\ + ./modules/ModelProcessorx/DiagnosticHutter/CreateNodesDiagnosticHutter.cpp \ + ./modules/ModelProcessorx/DiagnosticHutter/CreateConstraintsDiagnosticHutter.cpp \ + ./modules/ModelProcessorx/DiagnosticHutter/CreateLoadsDiagnosticHutter.cpp +diagnostic_psources =./solutions/diagnostic_core.cpp\ + ./solvers/solver_stokescoupling_nonlinear.cpp #}}} #Balanced sources {{{1 balanced_sources = ./modules/ModelProcessorx/Balancethickness/UpdateElementsBalancethickness.cpp\ - ./modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp\ - ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp\ - ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp + ./modules/ModelProcessorx/Balancethickness/CreateNodesBalancethickness.cpp\ + ./modules/ModelProcessorx/Balancethickness/CreateConstraintsBalancethickness.cpp\ + ./modules/ModelProcessorx/Balancethickness/CreateLoadsBalancethickness.cpp balanced_psources = ./solutions/balancethickness_core.cpp #}}} #Responses sources {{{1 -responses_sources = ./modules/MinVelx/MinVelx.h\ - ./modules/MinVelx/MinVelx.cpp\ - ./modules/MaxVelx/MaxVelx.h\ - ./modules/MaxVelx/MaxVelx.cpp\ - ./modules/MaxAbsVxx/MaxAbsVxx.h\ - ./modules/MaxAbsVxx/MaxAbsVxx.cpp\ - ./modules/MaxAbsVyx/MaxAbsVyx.h\ - ./modules/MaxAbsVyx/MaxAbsVyx.cpp\ - ./modules/MaxAbsVzx/MaxAbsVzx.h\ - ./modules/MaxAbsVzx/MaxAbsVzx.cpp\ - ./modules/MaxVxx/MaxVxx.h\ - ./modules/MaxVxx/MaxVxx.cpp\ - ./modules/MaxVyx/MaxVyx.h\ - ./modules/MaxVyx/MaxVyx.cpp\ - ./modules/MaxVzx/MaxVzx.h\ - ./modules/MaxVzx/MaxVzx.cpp\ - ./modules/MinVxx/MinVxx.h\ - ./modules/MinVxx/MinVxx.cpp\ - ./modules/MinVyx/MinVyx.h\ - ./modules/MinVyx/MinVyx.cpp\ - ./modules/MinVzx/MinVzx.h\ - ./modules/MinVzx/MinVzx.cpp\ - ./modules/IceVolumex/IceVolumex.h\ - ./modules/IceVolumex/IceVolumex.cpp\ - ./modules/RheologyBbarx/RheologyBbarx.cpp\ - ./modules/RheologyBbarx/RheologyBbarx.h\ - ./modules/MassFluxx/MassFluxx.cpp\ - ./modules/MassFluxx/MassFluxx.h +responses_sources = ./modules/MinVelx/MinVelx.h\ + ./modules/MinVelx/MinVelx.cpp\ + ./modules/MaxVelx/MaxVelx.h\ + ./modules/MaxVelx/MaxVelx.cpp\ + ./modules/MaxAbsVxx/MaxAbsVxx.h\ + ./modules/MaxAbsVxx/MaxAbsVxx.cpp\ + ./modules/MaxAbsVyx/MaxAbsVyx.h\ + ./modules/MaxAbsVyx/MaxAbsVyx.cpp\ + ./modules/MaxAbsVzx/MaxAbsVzx.h\ + ./modules/MaxAbsVzx/MaxAbsVzx.cpp\ + ./modules/MaxVxx/MaxVxx.h\ + ./modules/MaxVxx/MaxVxx.cpp\ + ./modules/MaxVyx/MaxVyx.h\ + ./modules/MaxVyx/MaxVyx.cpp\ + ./modules/MaxVzx/MaxVzx.h\ + ./modules/MaxVzx/MaxVzx.cpp\ + ./modules/MinVxx/MinVxx.h\ + ./modules/MinVxx/MinVxx.cpp\ + ./modules/MinVyx/MinVyx.h\ + ./modules/MinVyx/MinVyx.cpp\ + ./modules/MinVzx/MinVzx.h\ + ./modules/MinVzx/MinVzx.cpp\ + ./modules/IceVolumex/IceVolumex.h\ + ./modules/IceVolumex/IceVolumex.cpp\ + ./modules/RheologyBbarx/RheologyBbarx.cpp\ + ./modules/RheologyBbarx/RheologyBbarx.h\ + ./modules/MassFluxx/MassFluxx.cpp\ + ./modules/MassFluxx/MassFluxx.h #}}} #Slope sources {{{1 -slope_sources = ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\ +slope_sources = ./modules/ModelProcessorx/BedSlope/UpdateElementsBedSlope.cpp\ ./modules/ModelProcessorx/BedSlope/CreateNodesBedSlope.cpp \ ./modules/ModelProcessorx/BedSlope/CreateConstraintsBedSlope.cpp\ @@ -532,31 +530,31 @@ ./modules/ModelProcessorx/SurfaceSlope/CreateConstraintsSurfaceSlope.cpp\ ./modules/ModelProcessorx/SurfaceSlope/CreateLoadsSurfaceSlope.cpp -slope_psources = ./solutions/surfaceslope_core.cpp\ +slope_psources = ./solutions/surfaceslope_core.cpp\ ./solutions/bedslope_core.cpp #}}} #Groundingline sources {{{1 groundingline_sources= ./modules/GroundinglineMigrationx/GroundinglineMigrationx.cpp\ - ./modules/GroundinglineMigrationx/GroundinglineMigrationx.h\ - ./modules/GroundinglineMigrationx/GroundinglineMigrationxLocal.h\ - ./modules/GroundinglineMigrationx/GroundinglineMigrationxUtils.cpp + ./modules/GroundinglineMigrationx/GroundinglineMigrationx.h\ + ./modules/GroundinglineMigrationx/GroundinglineMigrationxLocal.h\ + ./modules/GroundinglineMigrationx/GroundinglineMigrationxUtils.cpp #}}} #Rifts sources {{{1 rifts_sources = ./objects/Loads/Riftfront.cpp\ - ./objects/Loads/Riftfront.h\ - ./modules/ConstraintsStatex/RiftConstraintsState.cpp + ./objects/Loads/Riftfront.h\ + ./modules/ConstraintsStatex/RiftConstraintsState.cpp #}}} #3D sources {{{1 threed_sources = ./objects/Gauss/GaussPenta.h\ - ./objects/Gauss/GaussPenta.cpp\ - ./objects/ElementResults/PentaVertexElementResult.h\ - ./objects/ElementResults/PentaVertexElementResult.cpp\ - ./objects/Inputs/PentaVertexInput.h\ - ./objects/Inputs/PentaVertexInput.cpp\ - ./objects/Elements/Penta.h\ - ./objects/Elements/Penta.cpp\ - ./objects/Elements/PentaHook.h\ - ./objects/Elements/PentaHook.cpp\ - ./objects/Elements/PentaRef.h\ - ./objects/Elements/PentaRef.cpp + ./objects/Gauss/GaussPenta.cpp\ + ./objects/ElementResults/PentaVertexElementResult.h\ + ./objects/ElementResults/PentaVertexElementResult.cpp\ + ./objects/Inputs/PentaVertexInput.h\ + ./objects/Inputs/PentaVertexInput.cpp\ + ./objects/Elements/Penta.h\ + ./objects/Elements/Penta.cpp\ + ./objects/Elements/PentaHook.h\ + ./objects/Elements/PentaHook.cpp\ + ./objects/Elements/PentaRef.h\ + ./objects/Elements/PentaRef.cpp #}}} #Bamg sources {{{1 @@ -628,73 +626,73 @@ #Kml sources {{{1 kml_sources = ./modules/Exp2Kmlx/Exp2Kmlx.h\ - ./modules/Exp2Kmlx/Exp2Kmlx.cpp\ - ./modules/Kml2Expx/Kml2Expx.h\ - ./modules/Kml2Expx/Kml2Expx.cpp\ - ./modules/Shp2Kmlx/Shp2Kmlx.h\ - ./modules/Shp2Kmlx/Shp2Kmlx.cpp\ - ./objects/KML/KML_Attribute.cpp\ - ./objects/KML/KML_Attribute.h\ - ./objects/KML/KML_ColorStyle.cpp\ - ./objects/KML/KML_ColorStyle.h\ - ./objects/KML/KML_Container.cpp\ - ./objects/KML/KML_Container.h\ - ./objects/KML/KML_Document.cpp\ - ./objects/KML/KML_Document.h\ - ./objects/KML/KML_Feature.cpp\ - ./objects/KML/KML_Feature.h\ - ./objects/KML/KML_File.cpp\ - ./objects/KML/KML_File.h\ - ./objects/KML/KML_Folder.cpp\ - ./objects/KML/KML_Folder.h\ - ./objects/KML/KML_Geometry.cpp\ - ./objects/KML/KML_Geometry.h\ - ./objects/KML/KML_GroundOverlay.cpp\ - ./objects/KML/KML_GroundOverlay.h\ - ./objects/KML/KML_Icon.cpp\ - ./objects/KML/KML_Icon.h\ - ./objects/KML/KML_LatLonBox.cpp\ - ./objects/KML/KML_LatLonBox.h\ - ./objects/KML/KML_LinearRing.cpp\ - ./objects/KML/KML_LinearRing.h\ - ./objects/KML/KML_LineString.cpp\ - ./objects/KML/KML_LineString.h\ - ./objects/KML/KML_LineStyle.cpp\ - ./objects/KML/KML_LineStyle.h\ - ./objects/KML/KML_MultiGeometry.cpp\ - ./objects/KML/KML_MultiGeometry.h\ - ./objects/KML/KML_Object.cpp\ - ./objects/KML/KML_Object.h\ - ./objects/KML/KML_Overlay.cpp\ - ./objects/KML/KML_Overlay.h\ - ./objects/KML/KML_Point.cpp\ - ./objects/KML/KML_Point.h\ - ./objects/KML/KML_Placemark.cpp\ - ./objects/KML/KML_Placemark.h\ - ./objects/KML/KML_Polygon.cpp\ - ./objects/KML/KML_Polygon.h\ - ./objects/KML/KML_PolyStyle.cpp\ - ./objects/KML/KML_PolyStyle.h\ - ./objects/KML/KML_Style.cpp\ - ./objects/KML/KML_Style.h\ - ./objects/KML/KML_StyleSelector.cpp\ - ./objects/KML/KML_StyleSelector.h\ - ./objects/KML/KML_SubStyle.cpp\ - ./objects/KML/KML_SubStyle.h\ - ./objects/KML/KMLFileReadUtils.cpp\ - ./objects/KML/KMLFileReadUtils.h + ./modules/Exp2Kmlx/Exp2Kmlx.cpp\ + ./modules/Kml2Expx/Kml2Expx.h\ + ./modules/Kml2Expx/Kml2Expx.cpp\ + ./modules/Shp2Kmlx/Shp2Kmlx.h\ + ./modules/Shp2Kmlx/Shp2Kmlx.cpp\ + ./objects/KML/KML_Attribute.cpp\ + ./objects/KML/KML_Attribute.h\ + ./objects/KML/KML_ColorStyle.cpp\ + ./objects/KML/KML_ColorStyle.h\ + ./objects/KML/KML_Container.cpp\ + ./objects/KML/KML_Container.h\ + ./objects/KML/KML_Document.cpp\ + ./objects/KML/KML_Document.h\ + ./objects/KML/KML_Feature.cpp\ + ./objects/KML/KML_Feature.h\ + ./objects/KML/KML_File.cpp\ + ./objects/KML/KML_File.h\ + ./objects/KML/KML_Folder.cpp\ + ./objects/KML/KML_Folder.h\ + ./objects/KML/KML_Geometry.cpp\ + ./objects/KML/KML_Geometry.h\ + ./objects/KML/KML_GroundOverlay.cpp\ + ./objects/KML/KML_GroundOverlay.h\ + ./objects/KML/KML_Icon.cpp\ + ./objects/KML/KML_Icon.h\ + ./objects/KML/KML_LatLonBox.cpp\ + ./objects/KML/KML_LatLonBox.h\ + ./objects/KML/KML_LinearRing.cpp\ + ./objects/KML/KML_LinearRing.h\ + ./objects/KML/KML_LineString.cpp\ + ./objects/KML/KML_LineString.h\ + ./objects/KML/KML_LineStyle.cpp\ + ./objects/KML/KML_LineStyle.h\ + ./objects/KML/KML_MultiGeometry.cpp\ + ./objects/KML/KML_MultiGeometry.h\ + ./objects/KML/KML_Object.cpp\ + ./objects/KML/KML_Object.h\ + ./objects/KML/KML_Overlay.cpp\ + ./objects/KML/KML_Overlay.h\ + ./objects/KML/KML_Point.cpp\ + ./objects/KML/KML_Point.h\ + ./objects/KML/KML_Placemark.cpp\ + ./objects/KML/KML_Placemark.h\ + ./objects/KML/KML_Polygon.cpp\ + ./objects/KML/KML_Polygon.h\ + ./objects/KML/KML_PolyStyle.cpp\ + ./objects/KML/KML_PolyStyle.h\ + ./objects/KML/KML_Style.cpp\ + ./objects/KML/KML_Style.h\ + ./objects/KML/KML_StyleSelector.cpp\ + ./objects/KML/KML_StyleSelector.h\ + ./objects/KML/KML_SubStyle.cpp\ + ./objects/KML/KML_SubStyle.h\ + ./objects/KML/KMLFileReadUtils.cpp\ + ./objects/KML/KMLFileReadUtils.h #}}} #Matlab sources {{{1 matlab_sources= ./shared/Matlab/matlabshared.h\ - ./shared/Matlab/ModuleBoot.cpp\ - ./shared/Matlab/ModuleEnd.cpp\ - ./shared/Matlab/mxGetAssignedField.cpp\ - ./shared/Matlab/mxGetField.cpp\ - ./shared/Matlab/CheckNumMatlabArguments.cpp\ - ./toolkits/matlab/matlabincludes.h\ - ./toolkits/matlab/MatlabNArrayToNArray.cpp\ - ./io/Matlab/matlabio.h\ - ./io/Matlab/WriteMatlabData.cpp\ - ./io/Matlab/FetchMatlabData.cpp\ - ./io/Matlab/OptionParse.cpp + ./shared/Matlab/ModuleBoot.cpp\ + ./shared/Matlab/ModuleEnd.cpp\ + ./shared/Matlab/mxGetAssignedField.cpp\ + ./shared/Matlab/mxGetField.cpp\ + ./shared/Matlab/CheckNumMatlabArguments.cpp\ + ./toolkits/matlab/matlabincludes.h\ + ./toolkits/matlab/MatlabNArrayToNArray.cpp\ + ./io/Matlab/matlabio.h\ + ./io/Matlab/WriteMatlabData.cpp\ + ./io/Matlab/FetchMatlabData.cpp\ + ./io/Matlab/OptionParse.cpp #}}} #Serialsources {{{1 @@ -736,4 +734,5 @@ ./modules/Chacox/chaco_seconds.cpp\ ./modules/Chacox/user_params.cpp\ + ./modules/Dakotax/SpawnCoreSerial.cpp\ ./modules/TriaSearchx/TriaSearchx.h\ ./modules/TriaSearchx/TriaSearchx.cpp\ @@ -789,48 +788,49 @@ #First the core issm_sources = $(core_sources) -issm_psources = +issm_psources = #Now the optional source if DAKOTA -issm_sources += $(dakota_sources) +issm_sources += $(dakota_sources) +issm_psources += $(dakota_psources) endif if TRANSIENT -issm_sources += $(transient_sources) +issm_sources += $(transient_sources) issm_psources += $(transient_psources) endif if STEADYSTATE -issm_sources += $(steadystate_sources) +issm_sources += $(steadystate_sources) issm_psources += $(steadystate_psources) endif if PROGNOSTIC -issm_sources += $(prognostic_sources) +issm_sources += $(prognostic_sources) issm_psources += $(prognostic_psources) endif if THERMAL -issm_sources += $(thermal_sources) +issm_sources += $(thermal_sources) issm_psources += $(thermal_psources) endif if CONTROL -issm_sources += $(control_sources) +issm_sources += $(control_sources) issm_psources += $(control_psources) endif if HYDROLOGY -issm_sources += $(hydrology_sources) +issm_sources += $(hydrology_sources) issm_psources += $(hydrology_psources) endif if DIAGNOSTIC -issm_sources += $(diagnostic_sources) +issm_sources += $(diagnostic_sources) issm_psources += $(diagnostic_psources) endif if BALANCED -issm_sources += $(balanced_sources) +issm_sources += $(balanced_sources) issm_psources += $(balanced_psources) endif @@ -841,5 +841,5 @@ if SLOPE -issm_sources += $(slope_sources) +issm_sources += $(slope_sources) issm_psources += $(slope_psources) endif @@ -856,9 +856,8 @@ issm_sources += $(threed_sources) endif - #}}} #ISSM serial library {{{1 -libISSM_a_SOURCES = $(issm_sources) +libISSM_a_SOURCES = $(issm_sources) libISSM_a_SOURCES += $(serial_sources) libISSM_a_SOURCES += $(bamg_sources) @@ -872,8 +871,7 @@ libISSM_a_CXXFLAGS += -DMX_COMPAT_32 endif - #}}} #ISSM parallel library {{{1 -libpISSM_a_SOURCES = $(issm_sources) +libpISSM_a_SOURCES = $(issm_sources) libpISSM_a_SOURCES += $(issm_psources) libpISSM_a_CXXFLAGS = -fPIC -D_PARALLEL_ -D_C_ $(CXXOPTFLAGS) @@ -881,9 +879,8 @@ #Overload library, to overload any non-standard symbols. {{{1 libOverload_a_SOURCES = ./shared/String/stricmp.c -libOverload_a_CFLAGS = -fPIC -D_PARALLEL_ -D_C_ $(COPTFLAGS) +libOverload_a_CFLAGS = -fPIC -D_PARALLEL_ -D_C_ $(COPTFLAGS) #}}} #Executable {{{1 - if NOPARALLEL bin_PROGRAMS = @@ -898,7 +895,5 @@ LDADD += $(PETSCLIB) $(TAOLIB) $(FLIBS) $(PLAPACKLIB) $(MUMPSLIB) $(SCALAPACKLIB) $(BLACSLIB) $(HYPRELIB) $(MLLIB) $(DAKOTALIB) $(METISLIB) $(CHACOLIB) $(SCOTCHLIB) $(BLASLAPACKLIB) $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB) $(MULTITHREADINGLIB) $(ADIC2LIB) - issm_exe_SOURCES = solutions/issm.cpp issm_exe_CXXFLAGS= -fPIC -D_PARALLEL_ $(CXXOPTFLAGS) $(COPTFLAGS) - -#}}} +#}}} Index: /issm/trunk/src/c/modules/Dakotax/SpawnCoreSerial.cpp =================================================================== --- /issm/trunk/src/c/modules/Dakotax/SpawnCoreSerial.cpp (revision 10307) +++ /issm/trunk/src/c/modules/Dakotax/SpawnCoreSerial.cpp (revision 10308) @@ -10,5 +10,4 @@ #error "Cannot compile with HAVE_CONFIG_H symbol! run configure first!" #endif - #include "../../objects/objects.h"