Bård Skaflestad
7d7f62ebc3
Conflicts: Makefile.am opm/core/grid/cpgpreprocess/facetopology.c opm/core/grid/cpgpreprocess/mxgrdecl.c opm/core/grid/cpgpreprocess/preprocess.c opm/core/grid/cpgpreprocess/sparsetable.c opm/core/grid/cpgpreprocess/sparsetable.h opm/core/grid/cpgpreprocess/uniquepoints.c This merge brings a new, more resilient and feature-complete corner-point processing. In particular, the new code features exact, in-plane vertex coordinates for face nodes that arise as a result of fault processing and which are not located on pillars. Secondly, the resulting grid's cells are ordered lexicographically with the I index cycling the most rapidly, followed by J and finally K. Finally, this merge also brings automatic handling of left-handed coordinate systems which, until now, have produced negative cell volumes as a result of face vertices being ordered such that interface normals point from cell 2 to cell 1 in this case. Left-handed coordinate systems are recognised using a simplistic triple-product characterisation akin to the implementation of function "processGRDECL" of MRST. This code is now an (almost) exact replica of revision 1001 of https://public.ict.sintef.no/viewvc/openrs/trunk/dune-cornerpoint/grid/preprocess/ The merge also removes opm/core/grid/cpgpreprocess/readvector*, so remove tests/test_readvector.cpp (and accompanying Make rule) to maintain a buildable tree.
69 lines
1.6 KiB
Makefile
69 lines
1.6 KiB
Makefile
AM_CPPFLAGS = \
|
|
-I$(top_srcdir) \
|
|
$(BOOST_CPPFLAGS)
|
|
|
|
LDFLAGS = $(BOOST_LDFLAGS)
|
|
|
|
|
|
LDADD = $(top_builddir)/libopmcore.la
|
|
|
|
|
|
noinst_PROGRAMS = \
|
|
bo_resprop_test \
|
|
monotcubicinterpolator_test \
|
|
param_test \
|
|
sparsetable_test \
|
|
sparsevector_test \
|
|
test_cartgrid \
|
|
test_column_extract \
|
|
test_lapack \
|
|
test_read_vag \
|
|
test_readpolymer \
|
|
test_sf2p \
|
|
test_writeVtkData \
|
|
unit_test
|
|
|
|
|
|
bo_resprop_test_SOURCES = bo_resprop_test.cpp
|
|
|
|
monotcubicinterpolator_test_SOURCES = monotcubicinterpolator_test.cpp
|
|
|
|
param_test_SOURCES = param_test.cpp
|
|
param_test_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
|
|
|
sparsetable_test_SOURCES = sparsetable_test.cpp
|
|
sparsetable_test_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
|
|
|
sparsevector_test_SOURCES = sparsevector_test.cpp
|
|
sparsevector_test_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
|
|
|
test_cartgrid_SOURCES = test_cartgrid.cpp
|
|
|
|
test_column_extract_SOURCES = test_column_extract.cpp
|
|
test_column_extract_LDADD = $(LDADD) $(BOOST_UNIT_TEST_FRAMEWORK_LIB)
|
|
|
|
test_lapack_SOURCES = test_lapack.cpp
|
|
test_lapack_LDADD = $(LAPACK_LIBS) $(BLAS_LIBS) $(LIBS) $(FLIBS)
|
|
|
|
test_readpolymer_SOURCES = test_readpolymer.cpp
|
|
test_read_vag_SOURCES = test_read_vag.cpp
|
|
|
|
test_sf2p_SOURCES = test_sf2p.cpp
|
|
|
|
test_writeVtkData_SOURCES = test_writeVtkData.cpp
|
|
|
|
unit_test_SOURCES = unit_test.cpp
|
|
|
|
|
|
if UMFPACK
|
|
noinst_PROGRAMS += test_cfs_tpfa
|
|
noinst_PROGRAMS += test_jacsys
|
|
test_jacsys_SOURCES = test_jacsys.cpp
|
|
endif
|
|
|
|
|
|
if BUILD_AGMG
|
|
noinst_PROGRAMS += test_agmg
|
|
test_agmg_SOURCES = test_agmg.cpp
|
|
endif
|