Skip to content

Commit

Permalink
Setting up a new example to exercise 3D Nedelec elements.
Browse files Browse the repository at this point in the history
  • Loading branch information
@pbauman @jwpeterson
pbauman authored and jwpeterson committed Aug 21, 2013
1 parent 0176abe commit 9bd8573
Show file tree
Hide file tree
Showing 15 changed files with 2,184 additions and 170 deletions.
106 changes: 53 additions & 53 deletions Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ AM_CFLAGS = $(libmesh_CFLAGS)
# codes. These will be augmented with method-specific
# cppflags later on
AM_CPPFLAGS = -DLIBMESH_IS_COMPILING_ITSELF \
$(libmesh_contrib_INCLUDES) \
$(libmesh_contrib_INCLUDES) \
$(libmesh_optional_INCLUDES) \
-I$(top_builddir)/include # required for libmesh_version.h

Expand All @@ -21,28 +21,28 @@ LIBS = $(libmesh_optional_LIBS)
# additional files which must be included in 'make dist'
EXTRA_DIST = reference_elements \
include/include_HEADERS \
include/rebuild_include_HEADERS.sh \
src/libmesh_SOURCES \
src/rebuild_libmesh_SOURCES.sh \
include/rebuild_include_HEADERS.sh \
src/libmesh_SOURCES \
src/rebuild_libmesh_SOURCES.sh \
contrib/tecplot/README \
contrib/bin/strip_dup_incl_paths.pl \
contrib/bin/strip_dup_libs.pl
contrib/bin/strip_dup_incl_paths.pl \
contrib/bin/strip_dup_libs.pl

nobase_data_DATA = \
reference_elements/2D/one_quad.xda \
reference_elements/2D/one_quad8.xda \
reference_elements/2D/one_quad9.xda \
reference_elements/2D/one_tri.xda \
reference_elements/2D/one_tri6.xda \
reference_elements/3D/one_hex.xda \
reference_elements/3D/one_hex20.xda \
reference_elements/3D/one_hex27.xda \
reference_elements/3D/one_prism.xda \
reference_elements/3D/one_prism15.xda \
reference_elements/3D/one_prism18.xda \
reference_elements/3D/one_pyramid.xda \
reference_elements/3D/one_tet.xda \
reference_elements/3D/one_tet10.xda
reference_elements/2D/one_quad.xda \
reference_elements/2D/one_quad8.xda \
reference_elements/2D/one_quad9.xda \
reference_elements/2D/one_tri.xda \
reference_elements/2D/one_tri6.xda \
reference_elements/3D/one_hex.xda \
reference_elements/3D/one_hex20.xda \
reference_elements/3D/one_hex27.xda \
reference_elements/3D/one_prism.xda \
reference_elements/3D/one_prism15.xda \
reference_elements/3D/one_prism18.xda \
reference_elements/3D/one_pyramid.xda \
reference_elements/3D/one_tet.xda \
reference_elements/3D/one_tet10.xda

# Tools in the auxillary directory
AUX_DIST = build-aux/install-sh \
Expand Down Expand Up @@ -84,18 +84,18 @@ libmesh_config_SCRIPTS = contrib/bin/libmesh-config
# fix up buggy libtool postdeps under specific compiler/mpi configurations
install-data-hook:
@if (test "x$(prefix)" != "x@prefix@") ; then \
oldprefix="@prefix@" ; \
newprefix="$(prefix)" ; \
for genfile in `find $(DESTDIR)$(prefix) -name "*.pc" -o -name Make.common -o -name libmesh-config -type f` ; do \
echo " " ; \
echo " *** replacing $$oldprefix" ; \
echo " *** with $$newprefix" ; \
echo " *** in generated file $$genfile" ; \
echo " " ; \
cd $(DESTDIR)$(prefix) && cat $$genfile | $(SED) "s,$$oldprefix,$$newprefix,g" > $$genfile.replaced ; \
cd $(DESTDIR)$(prefix) && mv $$genfile.replaced $$genfile ; \
oldprefix="@prefix@" ; \
newprefix="$(prefix)" ; \
for genfile in `find $(DESTDIR)$(prefix) -name "*.pc" -o -name Make.common -o -name libmesh-config -type f` ; do \
echo " " ; \
echo " *** replacing $$oldprefix" ; \
echo " *** with $$newprefix" ; \
echo " *** in generated file $$genfile" ; \
echo " " ; \
cd $(DESTDIR)$(prefix) && cat $$genfile | $(SED) "s,$$oldprefix,$$newprefix,g" > $$genfile.replaced ; \
cd $(DESTDIR)$(prefix) && mv $$genfile.replaced $$genfile ; \
done ; \
fi
fi
cd $(DESTDIR)$(prefix) && rm -f Make.common && $(LN_S) etc/libmesh/Make.common Make.common
cat $(DESTDIR)$(libmesh_configdir)/libmesh-config | $(SED) "s/has_been_installed=no/has_been_installed=yes/g" > $(DESTDIR)$(libmesh_configdir)/libmesh-config.installed
mv $(DESTDIR)$(libmesh_configdir)/libmesh-config.installed $(DESTDIR)$(libmesh_configdir)/libmesh-config && chmod +x $(DESTDIR)$(libmesh_configdir)/libmesh-config
Expand All @@ -106,36 +106,36 @@ install-data-hook:
# this rule invokes emacs on each source file to remove trailing whitespace.
beautify:
for file in `find $(srcdir)/{src,include,examples,tests} -name "*.C" -o -name "*.h" -o -name Makefile.am -type f` ; do \
echo $$file ; \
emacs -batch $$file --eval '(delete-trailing-whitespace)' -f save-buffer 2>/dev/null ; \
done
echo $$file ; \
emacs -batch $$file --eval '(delete-trailing-whitespace)' -f save-buffer 2>/dev/null ; \
done


# Additional files to be deleted by 'make distclean'
# _configs.sed seems to be leftover by prefix_config
DISTCLEANFILES = \
_configs.sed
_configs.sed

# # Additional files to be deleted by 'make maintainer-clean'
# MAINTAINERCLEANFILES = \
# $(AUX_DIST) \
# Makefile.in \
# aclocal.m4 \
# aminclude.am \
# autom4te.cache/* \
# config.h \
# config.h.in \
# config.log \
# config.status \
# config.sub \
# configure \
# data/Makefile.in \
# src/Makefile.in \
# src/physics/properties/Makefile.in \
# test/Makefile.in \
# test/common/Makefile.in \
# test/comp_ns/Makefile.in \
# test/unit/Makefile.in
# $(AUX_DIST) \
# Makefile.in \
# aclocal.m4 \
# aminclude.am \
# autom4te.cache/* \
# config.h \
# config.h.in \
# config.log \
# config.status \
# config.sub \
# configure \
# data/Makefile.in \
# src/Makefile.in \
# src/physics/properties/Makefile.in \
# test/Makefile.in \
# test/common/Makefile.in \
# test/comp_ns/Makefile.in \
# test/unit/Makefile.in



Expand Down
96 changes: 48 additions & 48 deletions Makefile.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4241,24 +4241,24 @@ vtkversion = @vtkversion@

# # Additional files to be deleted by 'make maintainer-clean'
# MAINTAINERCLEANFILES = \
# $(AUX_DIST) \
# Makefile.in \
# aclocal.m4 \
# aminclude.am \
# autom4te.cache/* \
# config.h \
# config.h.in \
# config.log \
# config.status \
# config.sub \
# configure \
# data/Makefile.in \
# src/Makefile.in \
# src/physics/properties/Makefile.in \
# test/Makefile.in \
# test/common/Makefile.in \
# test/comp_ns/Makefile.in \
# test/unit/Makefile.in
# $(AUX_DIST) \
# Makefile.in \
# aclocal.m4 \
# aminclude.am \
# autom4te.cache/* \
# config.h \
# config.h.in \
# config.log \
# config.status \
# config.sub \
# configure \
# data/Makefile.in \
# src/Makefile.in \
# src/physics/properties/Makefile.in \
# test/Makefile.in \
# test/common/Makefile.in \
# test/comp_ns/Makefile.in \
# test/unit/Makefile.in
SUBDIRS = include contrib $(am__append_6) $(am__append_10)
AUTOMAKE_OPTIONS = subdir-objects
ACLOCAL_AMFLAGS = -I m4
Expand All @@ -4269,7 +4269,7 @@ AM_CFLAGS = $(libmesh_CFLAGS)
# codes. These will be augmented with method-specific
# cppflags later on
AM_CPPFLAGS = -DLIBMESH_IS_COMPILING_ITSELF \
$(libmesh_contrib_INCLUDES) \
$(libmesh_contrib_INCLUDES) \
$(libmesh_optional_INCLUDES) \
-I$(top_builddir)/include # required for libmesh_version.h

Expand All @@ -4281,20 +4281,20 @@ EXTRA_DIST = reference_elements include/include_HEADERS \
contrib/bin/strip_dup_incl_paths.pl \
contrib/bin/strip_dup_libs.pl contrib/bin/make_dependencies.pl
nobase_data_DATA = \
reference_elements/2D/one_quad.xda \
reference_elements/2D/one_quad8.xda \
reference_elements/2D/one_quad9.xda \
reference_elements/2D/one_tri.xda \
reference_elements/2D/one_tri6.xda \
reference_elements/3D/one_hex.xda \
reference_elements/3D/one_hex20.xda \
reference_elements/3D/one_hex27.xda \
reference_elements/3D/one_prism.xda \
reference_elements/3D/one_prism15.xda \
reference_elements/3D/one_prism18.xda \
reference_elements/3D/one_pyramid.xda \
reference_elements/3D/one_tet.xda \
reference_elements/3D/one_tet10.xda
reference_elements/2D/one_quad.xda \
reference_elements/2D/one_quad8.xda \
reference_elements/2D/one_quad9.xda \
reference_elements/2D/one_tri.xda \
reference_elements/2D/one_tri6.xda \
reference_elements/3D/one_hex.xda \
reference_elements/3D/one_hex20.xda \
reference_elements/3D/one_hex27.xda \
reference_elements/3D/one_prism.xda \
reference_elements/3D/one_prism15.xda \
reference_elements/3D/one_prism18.xda \
reference_elements/3D/one_pyramid.xda \
reference_elements/3D/one_tet.xda \
reference_elements/3D/one_tet10.xda


# Tools in the auxillary directory
Expand Down Expand Up @@ -4333,7 +4333,7 @@ libmesh_config_SCRIPTS = contrib/bin/libmesh-config
# Additional files to be deleted by 'make distclean'
# _configs.sed seems to be leftover by prefix_config
DISTCLEANFILES = \
_configs.sed
_configs.sed


# Do not edit - automatically generated from ./rebuild_libmesh_SOURCES.sh
Expand Down Expand Up @@ -27438,18 +27438,18 @@ uninstall-am: uninstall-binPROGRAMS uninstall-binSCRIPTS \
# fix up buggy libtool postdeps under specific compiler/mpi configurations
install-data-hook:
@if (test "x$(prefix)" != "x@prefix@") ; then \
oldprefix="@prefix@" ; \
newprefix="$(prefix)" ; \
for genfile in `find $(DESTDIR)$(prefix) -name "*.pc" -o -name Make.common -o -name libmesh-config -type f` ; do \
echo " " ; \
echo " *** replacing $$oldprefix" ; \
echo " *** with $$newprefix" ; \
echo " *** in generated file $$genfile" ; \
echo " " ; \
cd $(DESTDIR)$(prefix) && cat $$genfile | $(SED) "s,$$oldprefix,$$newprefix,g" > $$genfile.replaced ; \
cd $(DESTDIR)$(prefix) && mv $$genfile.replaced $$genfile ; \
oldprefix="@prefix@" ; \
newprefix="$(prefix)" ; \
for genfile in `find $(DESTDIR)$(prefix) -name "*.pc" -o -name Make.common -o -name libmesh-config -type f` ; do \
echo " " ; \
echo " *** replacing $$oldprefix" ; \
echo " *** with $$newprefix" ; \
echo " *** in generated file $$genfile" ; \
echo " " ; \
cd $(DESTDIR)$(prefix) && cat $$genfile | $(SED) "s,$$oldprefix,$$newprefix,g" > $$genfile.replaced ; \
cd $(DESTDIR)$(prefix) && mv $$genfile.replaced $$genfile ; \
done ; \
fi
fi
cd $(DESTDIR)$(prefix) && rm -f Make.common && $(LN_S) etc/libmesh/Make.common Make.common
cat $(DESTDIR)$(libmesh_configdir)/libmesh-config | $(SED) "s/has_been_installed=no/has_been_installed=yes/g" > $(DESTDIR)$(libmesh_configdir)/libmesh-config.installed
mv $(DESTDIR)$(libmesh_configdir)/libmesh-config.installed $(DESTDIR)$(libmesh_configdir)/libmesh-config && chmod +x $(DESTDIR)$(libmesh_configdir)/libmesh-config
Expand All @@ -27459,9 +27459,9 @@ install-data-hook:
# this rule invokes emacs on each source file to remove trailing whitespace.
beautify:
for file in `find $(srcdir)/{src,include,examples,tests} -name "*.C" -o -name "*.h" -o -name Makefile.am -type f` ; do \
echo $$file ; \
emacs -batch $$file --eval '(delete-trailing-whitespace)' -f save-buffer 2>/dev/null ; \
done
echo $$file ; \
emacs -batch $$file --eval '(delete-trailing-whitespace)' -f save-buffer 2>/dev/null ; \
done

#
.PHONY: examples_doc doc svnexpand
Expand Down
3 changes: 2 additions & 1 deletion configure
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33824,7 +33824,7 @@ $as_echo "#define BUILD_DATE __DATE__\" \"__TIME__" >>confdefs.h

# Each example gets a makefile
if (test "x$enableexamples" = "xyes"); then
ac_config_files="$ac_config_files examples/introduction/introduction_ex1/Makefile examples/introduction/introduction_ex2/Makefile examples/introduction/introduction_ex3/Makefile examples/introduction/introduction_ex4/Makefile examples/introduction/introduction_ex5/Makefile examples/adaptivity/adaptivity_ex1/Makefile examples/adaptivity/adaptivity_ex2/Makefile examples/adaptivity/adaptivity_ex3/Makefile examples/adaptivity/adaptivity_ex4/Makefile examples/adaptivity/adaptivity_ex5/Makefile examples/adjoints/adjoints_ex1/Makefile examples/adjoints/adjoints_ex2/Makefile examples/adjoints/adjoints_ex3/Makefile examples/adjoints/adjoints_ex4/Makefile examples/adjoints/adjoints_ex5/Makefile examples/eigenproblems/eigenproblems_ex1/Makefile examples/eigenproblems/eigenproblems_ex2/Makefile examples/eigenproblems/eigenproblems_ex3/Makefile examples/fem_system/fem_system_ex1/Makefile examples/fem_system/fem_system_ex2/Makefile examples/solution_transfer/solution_transfer_ex1/Makefile examples/miscellaneous/miscellaneous_ex1/Makefile examples/miscellaneous/miscellaneous_ex2/Makefile examples/miscellaneous/miscellaneous_ex3/Makefile examples/miscellaneous/miscellaneous_ex4/Makefile examples/miscellaneous/miscellaneous_ex5/Makefile examples/miscellaneous/miscellaneous_ex6/Makefile examples/miscellaneous/miscellaneous_ex7/Makefile examples/miscellaneous/miscellaneous_ex8/Makefile examples/miscellaneous/miscellaneous_ex9/Makefile examples/subdomains/subdomains_ex1/Makefile examples/subdomains/subdomains_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex1/Makefile examples/systems_of_equations/systems_of_equations_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex3/Makefile examples/systems_of_equations/systems_of_equations_ex4/Makefile examples/systems_of_equations/systems_of_equations_ex5/Makefile examples/systems_of_equations/systems_of_equations_ex6/Makefile examples/reduced_basis/reduced_basis_ex1/Makefile examples/reduced_basis/reduced_basis_ex2/Makefile examples/reduced_basis/reduced_basis_ex3/Makefile examples/reduced_basis/reduced_basis_ex4/Makefile examples/reduced_basis/reduced_basis_ex5/Makefile examples/reduced_basis/reduced_basis_ex6/Makefile examples/reduced_basis/reduced_basis_ex7/Makefile examples/transient/transient_ex1/Makefile examples/transient/transient_ex2/Makefile examples/vector_fe/vector_fe_ex1/Makefile examples/vector_fe/vector_fe_ex2/Makefile examples/vector_fe/vector_fe_ex3/Makefile examples/Makefile"
ac_config_files="$ac_config_files examples/introduction/introduction_ex1/Makefile examples/introduction/introduction_ex2/Makefile examples/introduction/introduction_ex3/Makefile examples/introduction/introduction_ex4/Makefile examples/introduction/introduction_ex5/Makefile examples/adaptivity/adaptivity_ex1/Makefile examples/adaptivity/adaptivity_ex2/Makefile examples/adaptivity/adaptivity_ex3/Makefile examples/adaptivity/adaptivity_ex4/Makefile examples/adaptivity/adaptivity_ex5/Makefile examples/adjoints/adjoints_ex1/Makefile examples/adjoints/adjoints_ex2/Makefile examples/adjoints/adjoints_ex3/Makefile examples/adjoints/adjoints_ex4/Makefile examples/adjoints/adjoints_ex5/Makefile examples/eigenproblems/eigenproblems_ex1/Makefile examples/eigenproblems/eigenproblems_ex2/Makefile examples/eigenproblems/eigenproblems_ex3/Makefile examples/fem_system/fem_system_ex1/Makefile examples/fem_system/fem_system_ex2/Makefile examples/solution_transfer/solution_transfer_ex1/Makefile examples/miscellaneous/miscellaneous_ex1/Makefile examples/miscellaneous/miscellaneous_ex2/Makefile examples/miscellaneous/miscellaneous_ex3/Makefile examples/miscellaneous/miscellaneous_ex4/Makefile examples/miscellaneous/miscellaneous_ex5/Makefile examples/miscellaneous/miscellaneous_ex6/Makefile examples/miscellaneous/miscellaneous_ex7/Makefile examples/miscellaneous/miscellaneous_ex8/Makefile examples/miscellaneous/miscellaneous_ex9/Makefile examples/subdomains/subdomains_ex1/Makefile examples/subdomains/subdomains_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex1/Makefile examples/systems_of_equations/systems_of_equations_ex2/Makefile examples/systems_of_equations/systems_of_equations_ex3/Makefile examples/systems_of_equations/systems_of_equations_ex4/Makefile examples/systems_of_equations/systems_of_equations_ex5/Makefile examples/systems_of_equations/systems_of_equations_ex6/Makefile examples/reduced_basis/reduced_basis_ex1/Makefile examples/reduced_basis/reduced_basis_ex2/Makefile examples/reduced_basis/reduced_basis_ex3/Makefile examples/reduced_basis/reduced_basis_ex4/Makefile examples/reduced_basis/reduced_basis_ex5/Makefile examples/reduced_basis/reduced_basis_ex6/Makefile examples/reduced_basis/reduced_basis_ex7/Makefile examples/transient/transient_ex1/Makefile examples/transient/transient_ex2/Makefile examples/vector_fe/vector_fe_ex1/Makefile examples/vector_fe/vector_fe_ex2/Makefile examples/vector_fe/vector_fe_ex3/Makefile examples/vector_fe/vector_fe_ex4/Makefile examples/Makefile"

fi

Expand Down Expand Up @@ -35410,6 +35410,7 @@ do
"examples/vector_fe/vector_fe_ex1/Makefile") CONFIG_FILES="$CONFIG_FILES examples/vector_fe/vector_fe_ex1/Makefile" ;;
"examples/vector_fe/vector_fe_ex2/Makefile") CONFIG_FILES="$CONFIG_FILES examples/vector_fe/vector_fe_ex2/Makefile" ;;
"examples/vector_fe/vector_fe_ex3/Makefile") CONFIG_FILES="$CONFIG_FILES examples/vector_fe/vector_fe_ex3/Makefile" ;;
"examples/vector_fe/vector_fe_ex4/Makefile") CONFIG_FILES="$CONFIG_FILES examples/vector_fe/vector_fe_ex4/Makefile" ;;
"examples/Makefile") CONFIG_FILES="$CONFIG_FILES examples/Makefile" ;;

*) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
Expand Down
Loading

0 comments on commit 9bd8573

Please sign in to comment.