From e8f1048b4652d8a0b692ffd151ac479df2bcad58 Mon Sep 17 00:00:00 2001 From: Joakim Hove Date: Wed, 27 Jun 2012 14:20:20 +0200 Subject: [PATCH] Merge fix in Makefile.am --- Makefile.am | 222 ---------------------------------------------------- 1 file changed, 222 deletions(-) diff --git a/Makefile.am b/Makefile.am index 22bc09ec..583e67ff 100644 --- a/Makefile.am +++ b/Makefile.am @@ -42,7 +42,6 @@ $(ERT_LDFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS) # # Please try to keep the list sorted. -<<<<<<< HEAD libopmcore_la_SOURCES = \ opm/core/GridManager.cpp \ opm/core/eclipse/EclipseGridInspector.cpp \ @@ -266,227 +265,6 @@ opm/core/wells/InjectionSpecification.hpp \ opm/core/wells/ProductionSpecification.hpp \ opm/core/wells/WellCollection.hpp \ opm/core/wells/WellsGroup.hpp \ -======= -libopmcore_la_SOURCES = \ -opm/core/GridManager.cpp \ -opm/core/eclipse/EclipseGridInspector.cpp \ -opm/core/eclipse/EclipseGridParser.cpp \ -opm/core/fluid/BlackoilPropertiesBasic.cpp \ -opm/core/fluid/BlackoilPropertiesFromDeck.cpp \ -opm/core/fluid/IncompPropertiesBasic.cpp \ -opm/core/fluid/IncompPropertiesFromDeck.cpp \ -opm/core/fluid/PvtPropertiesBasic.cpp \ -opm/core/fluid/PvtPropertiesIncompFromDeck.cpp \ -opm/core/fluid/RockBasic.cpp \ -opm/core/fluid/RockCompressibility.cpp \ -opm/core/fluid/RockFromDeck.cpp \ -opm/core/fluid/SaturationPropsBasic.cpp \ -opm/core/fluid/SaturationPropsFromDeck.cpp \ -opm/core/fluid/blackoil/BlackoilPvtProperties.cpp \ -opm/core/fluid/blackoil/SinglePvtDead.cpp \ -opm/core/fluid/blackoil/SinglePvtInterface.cpp \ -opm/core/fluid/blackoil/SinglePvtLiveGas.cpp \ -opm/core/fluid/blackoil/SinglePvtLiveOil.cpp \ -opm/core/grid.c \ -opm/core/grid/cart_grid.c \ -opm/core/grid/cornerpoint_grid.c \ -opm/core/grid/cpgpreprocess/facetopology.c \ -opm/core/grid/cpgpreprocess/geometry.c \ -opm/core/grid/cpgpreprocess/preprocess.c \ -opm/core/grid/cpgpreprocess/uniquepoints.c \ -opm/core/linalg/LinearSolverFactory.cpp \ -opm/core/linalg/LinearSolverInterface.cpp \ -opm/core/linalg/sparse_sys.c \ -opm/core/newwells.c \ -opm/core/pressure/CompressibleTpfa.cpp \ -opm/core/pressure/FlowBCManager.cpp \ -opm/core/pressure/IncompTpfa.cpp \ -opm/core/pressure/cfsh.c \ -opm/core/pressure/flow_bc.c \ -opm/core/pressure/fsh.c \ -opm/core/pressure/fsh_common_impl.c \ -opm/core/pressure/ifsh.c \ -opm/core/pressure/mimetic/hybsys.c \ -opm/core/pressure/mimetic/hybsys_global.c \ -opm/core/pressure/mimetic/mimetic.c \ -opm/core/pressure/msmfem/coarse_conn.c \ -opm/core/pressure/msmfem/coarse_sys.c \ -opm/core/pressure/msmfem/dfs.c \ -opm/core/pressure/msmfem/hash_set.c \ -opm/core/pressure/msmfem/ifsh_ms.c \ -opm/core/pressure/msmfem/partition.c \ -opm/core/pressure/tpfa/cfs_tpfa.c \ -opm/core/pressure/tpfa/cfs_tpfa_residual.c \ -opm/core/pressure/tpfa/compr_bc.c \ -opm/core/pressure/tpfa/compr_quant.c \ -opm/core/pressure/tpfa/compr_quant_general.c \ -opm/core/pressure/tpfa/compr_source.c \ -opm/core/pressure/tpfa/ifs_tpfa.c \ -opm/core/pressure/tpfa/trans_tpfa.c \ -opm/core/pressure/well.c \ -opm/core/simulator/SimulatorReport.cpp \ -opm/core/simulator/SimulatorTimer.cpp \ -opm/core/simulator/SimulatorTwophase.cpp \ -opm/core/transport/reorder/TransportModelCompressibleTwophase.cpp \ -opm/core/transport/reorder/TransportModelInterface.cpp \ -opm/core/transport/reorder/TransportModelTwophase.cpp \ -opm/core/transport/reorder/nlsolvers.c \ -opm/core/transport/reorder/reordersequence.cpp \ -opm/core/transport/reorder/tarjan.c \ -opm/core/transport/spu_explicit.c \ -opm/core/transport/spu_implicit.c \ -opm/core/transport/transport_source.c \ -opm/core/utility/MonotCubicInterpolator.cpp \ -opm/core/utility/StopWatch.cpp \ -opm/core/utility/miscUtilities.cpp \ -opm/core/utility/miscUtilitiesBlackoil.cpp \ -opm/core/utility/parameters/Parameter.cpp \ -opm/core/utility/parameters/ParameterGroup.cpp \ -opm/core/utility/parameters/ParameterTools.cpp \ -opm/core/utility/parameters/ParameterXML.cpp \ -opm/core/utility/parameters/tinyxml/tinystr.cpp \ -opm/core/utility/parameters/tinyxml/tinyxml.cpp \ -opm/core/utility/parameters/tinyxml/tinyxmlerror.cpp \ -opm/core/utility/parameters/tinyxml/tinyxmlparser.cpp \ -opm/core/utility/writeVtkData.cpp \ -opm/core/vag_format/vag.cpp \ -opm/core/wells/InjectionSpecification.cpp \ -opm/core/wells/ProductionSpecification.cpp \ -opm/core/wells/WellCollection.cpp \ -opm/core/wells/WellsGroup.cpp \ -opm/core/wells/WellsManager.cpp - -nobase_include_HEADERS = \ -opm/core/GridAdapter.hpp \ -opm/core/GridManager.hpp \ -opm/core/eclipse/CornerpointChopper.hpp \ -opm/core/eclipse/EclipseGridInspector.hpp \ -opm/core/eclipse/EclipseGridParser.hpp \ -opm/core/eclipse/EclipseGridParserHelpers.hpp \ -opm/core/eclipse/EclipseUnits.hpp \ -opm/core/eclipse/SpecialEclipseFields.hpp \ -opm/core/fluid/BlackoilPropertiesBasic.hpp \ -opm/core/fluid/BlackoilPropertiesFromDeck.hpp \ -opm/core/fluid/BlackoilPropertiesInterface.hpp \ -opm/core/fluid/IncompPropertiesBasic.hpp \ -opm/core/fluid/IncompPropertiesFromDeck.hpp \ -opm/core/fluid/IncompPropertiesInterface.hpp \ -opm/core/fluid/PvtPropertiesBasic.hpp \ -opm/core/fluid/PvtPropertiesIncompFromDeck.hpp \ -opm/core/fluid/RockBasic.hpp \ -opm/core/fluid/RockCompressibility.hpp \ -opm/core/fluid/RockFromDeck.hpp \ -opm/core/fluid/SaturationPropsBasic.hpp \ -opm/core/fluid/SaturationPropsFromDeck.hpp \ -opm/core/fluid/SimpleFluid2p.hpp \ -opm/core/fluid/blackoil/BlackoilPhases.hpp \ -opm/core/fluid/blackoil/BlackoilPvtProperties.hpp \ -opm/core/fluid/blackoil/SinglePvtConstCompr.hpp \ -opm/core/fluid/blackoil/SinglePvtDead.hpp \ -opm/core/fluid/blackoil/SinglePvtInterface.hpp \ -opm/core/fluid/blackoil/SinglePvtLiveGas.hpp \ -opm/core/fluid/blackoil/SinglePvtLiveOil.hpp \ -opm/core/fluid/blackoil/phaseUsageFromDeck.hpp \ -opm/core/grid.h \ -opm/core/grid/cart_grid.h \ -opm/core/grid/cornerpoint_grid.h \ -opm/core/grid/cpgpreprocess/facetopology.h \ -opm/core/grid/cpgpreprocess/geometry.h \ -opm/core/grid/cpgpreprocess/grdecl.h \ -opm/core/grid/cpgpreprocess/preprocess.h \ -opm/core/grid/cpgpreprocess/uniquepoints.h \ -opm/core/linalg/LinearSolverFactory.hpp \ -opm/core/linalg/LinearSolverInterface.hpp \ -opm/core/linalg/blas_lapack.h \ -opm/core/linalg/sparse_sys.h \ -opm/core/newwells.h \ -opm/core/pressure/CompressibleTpfa.hpp \ -opm/core/pressure/FlowBCManager.hpp \ -opm/core/pressure/HybridPressureSolver.hpp \ -opm/core/pressure/IncompTpfa.hpp \ -opm/core/pressure/TPFACompressiblePressureSolver.hpp \ -opm/core/pressure/TPFAPressureSolver.hpp \ -opm/core/pressure/flow_bc.h \ -opm/core/pressure/fsh.h \ -opm/core/pressure/fsh_common_impl.h \ -opm/core/pressure/mimetic/hybsys.h \ -opm/core/pressure/mimetic/hybsys_global.h \ -opm/core/pressure/mimetic/mimetic.h \ -opm/core/pressure/msmfem/coarse_conn.h \ -opm/core/pressure/msmfem/coarse_sys.h \ -opm/core/pressure/msmfem/dfs.h \ -opm/core/pressure/msmfem/hash_set.h \ -opm/core/pressure/msmfem/ifsh_ms.h \ -opm/core/pressure/msmfem/partition.h \ -opm/core/pressure/tpfa/cfs_tpfa.h \ -opm/core/pressure/tpfa/cfs_tpfa_residual.h \ -opm/core/pressure/tpfa/compr_bc.h \ -opm/core/pressure/tpfa/compr_quant.h \ -opm/core/pressure/tpfa/compr_quant_general.h \ -opm/core/pressure/tpfa/compr_source.h \ -opm/core/pressure/tpfa/ifs_tpfa.h \ -opm/core/pressure/tpfa/trans_tpfa.h \ -opm/core/simulator/BlackoilState.hpp \ -opm/core/simulator/SimulatorReport.hpp \ -opm/core/simulator/SimulatorTimer.hpp \ -opm/core/simulator/SimulatorTwophase.hpp \ -opm/core/simulator/TwophaseState.hpp \ -opm/core/simulator/WellState.hpp \ -opm/core/transport/CSRMatrixBlockAssembler.hpp \ -opm/core/transport/CSRMatrixUmfpackSolver.hpp \ -opm/core/transport/GravityColumnSolver.hpp \ -opm/core/transport/GravityColumnSolver_impl.hpp \ -opm/core/transport/ImplicitAssembly.hpp \ -opm/core/transport/ImplicitTransport.hpp \ -opm/core/transport/JacobianSystem.hpp \ -opm/core/transport/NormSupport.hpp \ -opm/core/transport/SimpleFluid2pWrapper.hpp \ -opm/core/transport/SinglePointUpwindTwoPhase.hpp \ -opm/core/transport/reorder/TransportModelCompressibleTwophase.hpp \ -opm/core/transport/reorder/TransportModelInterface.hpp \ -opm/core/transport/reorder/TransportModelTwophase.hpp \ -opm/core/transport/reorder/nlsolvers.h \ -opm/core/transport/reorder/reordersequence.h \ -opm/core/transport/reorder/tarjan.h \ -opm/core/transport/spu_explicit.h \ -opm/core/transport/spu_implicit.h \ -opm/core/transport/transport_source.h \ -opm/core/utility/Average.hpp \ -opm/core/utility/ColumnExtract.hpp \ -opm/core/utility/ErrorMacros.hpp \ -opm/core/utility/Factory.hpp \ -opm/core/utility/MonotCubicInterpolator.hpp \ -opm/core/utility/RootFinders.hpp \ -opm/core/utility/SparseTable.hpp \ -opm/core/utility/SparseVector.hpp \ -opm/core/utility/StopWatch.hpp \ -opm/core/utility/UniformTableLinear.hpp \ -opm/core/utility/Units.hpp \ -opm/core/utility/buildUniformMonotoneTable.hpp \ -opm/core/utility/initState.hpp \ -opm/core/utility/initState_impl.hpp \ -opm/core/utility/linInt.hpp \ -opm/core/utility/linearInterpolation.hpp \ -opm/core/utility/miscUtilities.hpp \ -opm/core/utility/miscUtilitiesBlackoil.hpp \ -opm/core/utility/parameters/Parameter.hpp \ -opm/core/utility/parameters/ParameterGroup.hpp \ -opm/core/utility/parameters/ParameterGroup_impl.hpp \ -opm/core/utility/parameters/ParameterMapItem.hpp \ -opm/core/utility/parameters/ParameterRequirement.hpp \ -opm/core/utility/parameters/ParameterStrings.hpp \ -opm/core/utility/parameters/ParameterTools.hpp \ -opm/core/utility/parameters/ParameterXML.hpp \ -opm/core/utility/parameters/tinyxml/tinystr.h \ -opm/core/utility/parameters/tinyxml/tinyxml.h \ -opm/core/utility/writeVtkData.hpp \ -opm/core/vag_format/vag.hpp \ -opm/core/well.h \ -opm/core/wells/InjectionSpecification.hpp \ -opm/core/wells/ProductionSpecification.hpp \ -opm/core/wells/WellCollection.hpp \ -opm/core/wells/WellsGroup.hpp \ ->>>>>>> master opm/core/wells/WellsManager.hpp # ----------------------------------------------------------------------