Merge branch 'master' of http://users.dune-project.org/repositories/projects/dune-fem-dg

.gitignore

@@ -39,6 +39,8 @@ data
 
 build-cmake
 
+CMakeCache.txt
+
 headercheck
 language_tests
 CMakeFiles

Makefile.am

-# $Id: duneproject 5842 2010-01-20 18:48:34Z joe $
-
-# we need the module file to be able to build via dunecontrol
-EXTRA_DIST=dune.module
-
-SUBDIRS = dune m4
-
-if BUILD_DOCS
-# TODO: set up documentation tree automatically
-#SUBDIRS += doc
-endif
-
-# don't follow the full GNU-standard
-# we need automake 1.5
-AUTOMAKE_OPTIONS = foreign 1.5
-
-# pass most important options when "make distcheck" is used
-DISTCHECK_CONFIGURE_FLAGS = --with-dune-common=$(DUNE_COMMON_ROOT) --with-dune-grid=$(DUNE_GRID_ROOT) --with-dune-fem=$(DUNE_FEM_ROOT)  CXX="$(CXX)" CC="$(CC)"
-
-include $(top_srcdir)/am/top-rules
-include $(top_srcdir)/am/global-rules
-

configure.ac

-# -*- Autoconf -*-
-# Process this file with autoconf to produce a configure script.
-AC_PREREQ(2.50)
-DUNE_AC_INIT # gets module version from dune.module file
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR([dune/fem-dg/operator/limiter/limiter.hh])
-AM_CONFIG_HEADER([config.h])
-
-
-# we need no more than the standard DE-stuff
-# this module depends on dune-common dune-grid dune-fem
-# this implies checking for [dune-common], [dune-grid], [dune-istl], [dune-fem]
-DUNE_CHECK_ALL
-
-# implicitly set the Dune-flags everywhere
-# preset variable to path such that #include <dune/...> works
-#AC_SUBST(AM_CPPFLAGS, '\${DUNE_CPPFLAGS} -I$(top_srcdir)')
-#AC_SUBST(AM_LDFLAGS, '\${DUNE_LDFLAGS} \${DUNE_LIBS}')
-AC_SUBST(AM_CPPFLAGS, '${DUNE_CPPFLAGS} -I$(top_srcdir)')
-AC_SUBST(AM_LDFLAGS, '${DUNE_LDFLAGS} ${DUNE_LIBS}')
-
-AC_CONFIG_FILES([
-  Makefile
-  m4/Makefile
-  dune/Makefile
-  dune/fem-dg/Makefile
-  dune/fem-dg/pass/Makefile
-  dune/fem-dg/operator/Makefile
-  dune/fem-dg/operator/adaptation/Makefile
-  dune/fem-dg/operator/limiter/Makefile
-  dune/fem-dg/operator/dg/Makefile
-  dune/fem-dg/operator/fluxes/Makefile
-  dune/fem-dg/stepper/Makefile
-  dune/fem-dg/solver/Makefile
-  dune/fem-dg/main/Makefile
-  dune/fem-dg/misc/Makefile
-  dune/fem-dg/models/Makefile
-  dune/fem-dg/test/Makefile
-  dune/fem-dg/test/dataio/Makefile
-  dune/fem-dg/test/advdiff/Makefile
-  dune/fem-dg/test/euler/Makefile
-  dune/fem-dg/test/poisson/Makefile
-  dune/fem-dg/test/stokes/Makefile
-  dune/fem-dg/test/navierstokes/Makefile
-  dune/fem-dg/assemble/Makefile
-  dune-fem-dg.pc
-])
-AC_OUTPUT
-# finally print the summary information
-DUNE_SUMMARY_ALL

dune/Makefile.am

-SUBDIRS = fem-dg
-include $(top_srcdir)/am/global-rules

dune/fem-dg/Makefile.am

-SUBDIRS = assemble main misc models operator pass solver stepper test
-include $(top_srcdir)/am/global-rules
-
-femdgdir = $(includedir)/dune/fem-dg
-femdg_HEADERS = femdgtest.hh

dune/fem-dg/algorithm/Makefile.am

-algorithmsrcdir = $(top_srcdir)/dune/fem/algorithm
-algorithmsrc_HEADERS = base.hh  evolution.hh  monitor.hh  steadystate.hh
-include $(top_srcdir)/am/global-rules

dune/fem-dg/assemble/Makefile.am

-assembledir = $(includedir)/dune/fem-dg/assemble
-assemble_HEADERS = primalmatrix.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/examples/Makefile.am

-include $(top_srcdir)/am/global-rules
-
-testdir = $(includedir)/dune/fem-dg/test
-test_HEADERS = 

dune/fem-dg/examples/dataio/Makefile.am

-#GRIDTYPE = ALUGRID_SIMPLEX
-#GRIDTYPE = CARTESIANGRID_ALUGRID_CUBE
-#GRIDTYPE = ALUGRID_CUBE
-#GRIDTYPE = SPGRID
-GRIDTYPE = YASPGRID
-GRIDDIM = 3
-POLORDER = 2
-DIMRANGE=5
-USE_SIONLIB=0
-
-AM_CPPFLAGS = $(ALL_PKG_CPPFLAGS) -DUSE_SIONLIB=$(USE_SIONLIB) \
-              -DPOLORDER=$(POLORDER) -DONLY_ONE_P \
-              -DDIMRANGE=$(DIMRANGE) -DENABLE_ADAPTIVELEAFINDEXSET_FOR_YASPGRID
-LDADD = $(ALL_PKG_LDFLAGS) $(ALL_PKG_LIBS)
-
-EXTRA_DIST = parameter
-CLEANFILES = *.*vtu
-
-BASEDIR = ../../main/
-SOURCES = $(BASEDIR)/main.cc $(BASEDIR)/main_pol.cc
-
-# install these headers 
-dataiodir = $(includedir)/dune/fem-dg/examples/dataio
-dataio_HEADERS = checkpointing.hh problemcreator.hh  problem.hh
-
-check_PROGRAMS = checkpointing dataconvert 
-nodist_checkpointing_SOURCES = $(SOURCES)
-dataconvert_SOURCES = dataconvert.cc
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/main/Makefile.am

-maindir = $(top_srcdir)/dune/fem-dg/main
-main_HEADERS = main.hh codegen.hh  codegen2.hh caching.hh caching2.hh \
-  vectorialbasefunctionset.hh default.hh \
-  main_0.cc main_1.cc  main_2.cc  main_3.cc  main_4.cc  main.cc main_pol.cc
-include $(top_srcdir)/am/global-rules

dune/fem-dg/misc/Makefile.am

-miscdir = $(includedir)/dune/fem-dg/misc
-misc_HEADERS = diagnostics.hh dgnorm.hh cons2prim.hh crs.hh streams.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/models/Makefile.am

-modelsdir = $(includedir)/dune/fem-dg/models
-models_HEADERS = defaultmodel.hh defaultprobleminterfaces.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/operator/Makefile.am

-SUBDIRS = adaptation limiter dg fluxes  
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/operator/adaptation/Makefile.am

-adaptationdir = $(includedir)/dune/fem-dg/operator/adaptation
-adaptation_HEADERS = adaptation.cc  adaptation.hh  \
-										 estimatorbase.hh estimator.hh utility.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/operator/dg/Makefile.am

-dgdir = $(includedir)/dune/fem-dg/operator/dg
-dg_HEADERS = discretemodelcommon.hh  fluxoperator.hh  primaldiscretemodel.hh \
-dgoperatorchoice.hh  fluxdiscretemodel.hh    operatorbase.hh  primaloperator.hh \
-passtraits.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/operator/fluxes/Makefile.am

-fluxesdir = $(includedir)/dune/fem-dg/operator/fluxes
-fluxes_HEADERS = averageflux.hh  diffusionflux.hh  ldgflux.hh \
-mhd_fluxes.hh  rotator.hh dgprimalfluxes.hh  eulerfluxes.hh  \
-mhd_eqns.hh  mhdfluxes.hh  mhd_eqns.cc  mhd_fluxes.cc noflux.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/operator/limiter/Makefile.am

-operatordir = $(includedir)/dune/fem-dg/operator/limiter
-operator_HEADERS = limiter.hh limitpass.hh limiterdiscretemodel.hh
-
-include $(top_srcdir)/am/global-rules

dune/fem-dg/pass/Makefile.am

-passdir = $(includedir)/dune/fem-dg/pass
-pass_HEADERS = assembleddiffusionpass.hh  dgmodelcaller.hh  dgmasspass.hh \
-               dgpass.hh  ellipticmodelcaller.hh  threadhandle.hh  threadpass.hh
-include $(top_srcdir)/am/global-rules

dune/fem-dg/solver/Makefile.am

-solverdir = $(includedir)/dune/fem-dg/solver
-solver_HEADERS = smartodesolver.hh  rungekuttasolver.hh
-
-include $(top_srcdir)/am/global-rules

m4/CMakeLists.txt

-set(M4FILES  dune-fem-dg.m4 bgq_l1prefetch.m4)
-set(aclocaldir  ${CMAKE_INSTALL_DATADIR}/aclocal)
-set(aclocal_DATA  ${M4FILES})
-set(EXTRA_DIST  ${M4FILES})
-# include not needed for CMake
-# include $(top_srcdir)/am/global-rules
-install(FILES ${aclocal_DATA} DESTINATION ${aclocaldir})
\ No newline at end of file