diff --git a/Makefile.in b/Makefile.in index 662cdbe98e3..3617963657d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -184,9 +184,9 @@ am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) am__libmesh_dbg_la_SOURCES_DIST = src/base/dof_map.C \ src/base/dof_map_constraints.C src/base/dof_object.C \ src/base/libmesh.C src/base/libmesh_isnan.c \ - src/base/periodic_boundaries.C src/base/periodic_boundary.C \ - src/base/periodic_boundary_base.C src/base/print_trace.C \ - src/base/reference_counted_object.C \ + src/base/libmesh_singleton.C src/base/periodic_boundaries.C \ + src/base/periodic_boundary.C src/base/periodic_boundary_base.C \ + src/base/print_trace.C src/base/reference_counted_object.C \ src/base/reference_counter.C \ src/error_estimation/adjoint_refinement_estimator.C \ src/error_estimation/adjoint_residual_error_estimator.C \ @@ -451,6 +451,7 @@ am__objects_1 = src/base/libmesh_dbg_la-dof_map.lo \ src/base/libmesh_dbg_la-dof_object.lo \ src/base/libmesh_dbg_la-libmesh.lo \ src/base/libmesh_dbg_la-libmesh_isnan.lo \ + src/base/libmesh_dbg_la-libmesh_singleton.lo \ src/base/libmesh_dbg_la-periodic_boundaries.lo \ src/base/libmesh_dbg_la-periodic_boundary.lo \ src/base/libmesh_dbg_la-periodic_boundary_base.lo \ @@ -859,9 +860,9 @@ libmesh_dbg_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ am__libmesh_devel_la_SOURCES_DIST = src/base/dof_map.C \ src/base/dof_map_constraints.C src/base/dof_object.C \ src/base/libmesh.C src/base/libmesh_isnan.c \ - src/base/periodic_boundaries.C src/base/periodic_boundary.C \ - src/base/periodic_boundary_base.C src/base/print_trace.C \ - src/base/reference_counted_object.C \ + src/base/libmesh_singleton.C src/base/periodic_boundaries.C \ + src/base/periodic_boundary.C src/base/periodic_boundary_base.C \ + src/base/print_trace.C src/base/reference_counted_object.C \ src/base/reference_counter.C \ src/error_estimation/adjoint_refinement_estimator.C \ src/error_estimation/adjoint_residual_error_estimator.C \ @@ -1125,6 +1126,7 @@ am__objects_2 = src/base/libmesh_devel_la-dof_map.lo \ src/base/libmesh_devel_la-dof_object.lo \ src/base/libmesh_devel_la-libmesh.lo \ src/base/libmesh_devel_la-libmesh_isnan.lo \ + src/base/libmesh_devel_la-libmesh_singleton.lo \ src/base/libmesh_devel_la-periodic_boundaries.lo \ src/base/libmesh_devel_la-periodic_boundary.lo \ src/base/libmesh_devel_la-periodic_boundary_base.lo \ @@ -1530,9 +1532,9 @@ libmesh_devel_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ am__libmesh_oprof_la_SOURCES_DIST = src/base/dof_map.C \ src/base/dof_map_constraints.C src/base/dof_object.C \ src/base/libmesh.C src/base/libmesh_isnan.c \ - src/base/periodic_boundaries.C src/base/periodic_boundary.C \ - src/base/periodic_boundary_base.C src/base/print_trace.C \ - src/base/reference_counted_object.C \ + src/base/libmesh_singleton.C src/base/periodic_boundaries.C \ + src/base/periodic_boundary.C src/base/periodic_boundary_base.C \ + src/base/print_trace.C src/base/reference_counted_object.C \ src/base/reference_counter.C \ src/error_estimation/adjoint_refinement_estimator.C \ src/error_estimation/adjoint_residual_error_estimator.C \ @@ -1796,6 +1798,7 @@ am__objects_3 = src/base/libmesh_oprof_la-dof_map.lo \ src/base/libmesh_oprof_la-dof_object.lo \ src/base/libmesh_oprof_la-libmesh.lo \ src/base/libmesh_oprof_la-libmesh_isnan.lo \ + src/base/libmesh_oprof_la-libmesh_singleton.lo \ src/base/libmesh_oprof_la-periodic_boundaries.lo \ src/base/libmesh_oprof_la-periodic_boundary.lo \ src/base/libmesh_oprof_la-periodic_boundary_base.lo \ @@ -2201,9 +2204,9 @@ libmesh_oprof_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ am__libmesh_opt_la_SOURCES_DIST = src/base/dof_map.C \ src/base/dof_map_constraints.C src/base/dof_object.C \ src/base/libmesh.C src/base/libmesh_isnan.c \ - src/base/periodic_boundaries.C src/base/periodic_boundary.C \ - src/base/periodic_boundary_base.C src/base/print_trace.C \ - src/base/reference_counted_object.C \ + src/base/libmesh_singleton.C src/base/periodic_boundaries.C \ + src/base/periodic_boundary.C src/base/periodic_boundary_base.C \ + src/base/print_trace.C src/base/reference_counted_object.C \ src/base/reference_counter.C \ src/error_estimation/adjoint_refinement_estimator.C \ src/error_estimation/adjoint_residual_error_estimator.C \ @@ -2467,6 +2470,7 @@ am__objects_4 = src/base/libmesh_opt_la-dof_map.lo \ src/base/libmesh_opt_la-dof_object.lo \ src/base/libmesh_opt_la-libmesh.lo \ src/base/libmesh_opt_la-libmesh_isnan.lo \ + src/base/libmesh_opt_la-libmesh_singleton.lo \ src/base/libmesh_opt_la-periodic_boundaries.lo \ src/base/libmesh_opt_la-periodic_boundary.lo \ src/base/libmesh_opt_la-periodic_boundary_base.lo \ @@ -2871,9 +2875,9 @@ libmesh_opt_la_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CXX \ am__libmesh_prof_la_SOURCES_DIST = src/base/dof_map.C \ src/base/dof_map_constraints.C src/base/dof_object.C \ src/base/libmesh.C src/base/libmesh_isnan.c \ - src/base/periodic_boundaries.C src/base/periodic_boundary.C \ - src/base/periodic_boundary_base.C src/base/print_trace.C \ - src/base/reference_counted_object.C \ + src/base/libmesh_singleton.C src/base/periodic_boundaries.C \ + src/base/periodic_boundary.C src/base/periodic_boundary_base.C \ + src/base/print_trace.C src/base/reference_counted_object.C \ src/base/reference_counter.C \ src/error_estimation/adjoint_refinement_estimator.C \ src/error_estimation/adjoint_residual_error_estimator.C \ @@ -3137,6 +3141,7 @@ am__objects_5 = src/base/libmesh_prof_la-dof_map.lo \ src/base/libmesh_prof_la-dof_object.lo \ src/base/libmesh_prof_la-libmesh.lo \ src/base/libmesh_prof_la-libmesh_isnan.lo \ + src/base/libmesh_prof_la-libmesh_singleton.lo \ src/base/libmesh_prof_la-periodic_boundaries.lo \ src/base/libmesh_prof_la-periodic_boundary.lo \ src/base/libmesh_prof_la-periodic_boundary_base.lo \ @@ -4313,6 +4318,7 @@ libmesh_SOURCES = \ src/base/dof_object.C \ src/base/libmesh.C \ src/base/libmesh_isnan.c \ + src/base/libmesh_singleton.C \ src/base/periodic_boundaries.C \ src/base/periodic_boundary.C \ src/base/periodic_boundary_base.C \ @@ -5016,6 +5022,8 @@ src/base/libmesh_dbg_la-libmesh.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_dbg_la-libmesh_isnan.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) +src/base/libmesh_dbg_la-libmesh_singleton.lo: \ + src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_dbg_la-periodic_boundaries.lo: \ src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_dbg_la-periodic_boundary.lo: \ @@ -6063,6 +6071,8 @@ src/base/libmesh_devel_la-libmesh.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_devel_la-libmesh_isnan.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) +src/base/libmesh_devel_la-libmesh_singleton.lo: \ + src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_devel_la-periodic_boundaries.lo: \ src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_devel_la-periodic_boundary.lo: \ @@ -7029,6 +7039,8 @@ src/base/libmesh_oprof_la-libmesh.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_oprof_la-libmesh_isnan.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) +src/base/libmesh_oprof_la-libmesh_singleton.lo: \ + src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_oprof_la-periodic_boundaries.lo: \ src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_oprof_la-periodic_boundary.lo: \ @@ -7995,6 +8007,8 @@ src/base/libmesh_opt_la-libmesh.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_opt_la-libmesh_isnan.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) +src/base/libmesh_opt_la-libmesh_singleton.lo: \ + src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_opt_la-periodic_boundaries.lo: \ src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_opt_la-periodic_boundary.lo: \ @@ -8958,6 +8972,8 @@ src/base/libmesh_prof_la-libmesh.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_prof_la-libmesh_isnan.lo: src/base/$(am__dirstamp) \ src/base/$(DEPDIR)/$(am__dirstamp) +src/base/libmesh_prof_la-libmesh_singleton.lo: \ + src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_prof_la-periodic_boundaries.lo: \ src/base/$(am__dirstamp) src/base/$(DEPDIR)/$(am__dirstamp) src/base/libmesh_prof_la-periodic_boundary.lo: \ @@ -10292,6 +10308,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-dof_object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-libmesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-libmesh_isnan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-libmesh_singleton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-periodic_boundaries.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-periodic_boundary.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_dbg_la-periodic_boundary_base.Plo@am__quote@ @@ -10303,6 +10320,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-dof_object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-libmesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-libmesh_isnan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-libmesh_singleton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-periodic_boundaries.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-periodic_boundary.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_devel_la-periodic_boundary_base.Plo@am__quote@ @@ -10314,6 +10332,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-dof_object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-libmesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-libmesh_isnan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-libmesh_singleton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-periodic_boundaries.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-periodic_boundary.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_oprof_la-periodic_boundary_base.Plo@am__quote@ @@ -10325,6 +10344,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-dof_object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-libmesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-libmesh_isnan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-libmesh_singleton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-periodic_boundaries.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-periodic_boundary.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_opt_la-periodic_boundary_base.Plo@am__quote@ @@ -10336,6 +10356,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-dof_object.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-libmesh.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-libmesh_isnan.Plo@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-libmesh_singleton.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-periodic_boundaries.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-periodic_boundary.Plo@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@src/base/$(DEPDIR)/libmesh_prof_la-periodic_boundary_base.Plo@am__quote@ @@ -12320,6 +12341,13 @@ src/base/libmesh_dbg_la-libmesh.lo: src/base/libmesh.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_dbg_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_dbg_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_dbg_la-libmesh.lo `test -f 'src/base/libmesh.C' || echo '$(srcdir)/'`src/base/libmesh.C +src/base/libmesh_dbg_la-libmesh_singleton.lo: src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_dbg_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_dbg_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_dbg_la-libmesh_singleton.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_dbg_la-libmesh_singleton.Tpo -c -o src/base/libmesh_dbg_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_dbg_la-libmesh_singleton.Tpo src/base/$(DEPDIR)/libmesh_dbg_la-libmesh_singleton.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/base/libmesh_singleton.C' object='src/base/libmesh_dbg_la-libmesh_singleton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_dbg_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_dbg_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_dbg_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C + src/base/libmesh_dbg_la-periodic_boundaries.lo: src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_dbg_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_dbg_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_dbg_la-periodic_boundaries.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_dbg_la-periodic_boundaries.Tpo -c -o src/base/libmesh_dbg_la-periodic_boundaries.lo `test -f 'src/base/periodic_boundaries.C' || echo '$(srcdir)/'`src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_dbg_la-periodic_boundaries.Tpo src/base/$(DEPDIR)/libmesh_dbg_la-periodic_boundaries.Plo @@ -15085,6 +15113,13 @@ src/base/libmesh_devel_la-libmesh.lo: src/base/libmesh.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_devel_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_devel_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_devel_la-libmesh.lo `test -f 'src/base/libmesh.C' || echo '$(srcdir)/'`src/base/libmesh.C +src/base/libmesh_devel_la-libmesh_singleton.lo: src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_devel_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_devel_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_devel_la-libmesh_singleton.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_devel_la-libmesh_singleton.Tpo -c -o src/base/libmesh_devel_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_devel_la-libmesh_singleton.Tpo src/base/$(DEPDIR)/libmesh_devel_la-libmesh_singleton.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/base/libmesh_singleton.C' object='src/base/libmesh_devel_la-libmesh_singleton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_devel_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_devel_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_devel_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C + src/base/libmesh_devel_la-periodic_boundaries.lo: src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_devel_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_devel_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_devel_la-periodic_boundaries.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_devel_la-periodic_boundaries.Tpo -c -o src/base/libmesh_devel_la-periodic_boundaries.lo `test -f 'src/base/periodic_boundaries.C' || echo '$(srcdir)/'`src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_devel_la-periodic_boundaries.Tpo src/base/$(DEPDIR)/libmesh_devel_la-periodic_boundaries.Plo @@ -17850,6 +17885,13 @@ src/base/libmesh_oprof_la-libmesh.lo: src/base/libmesh.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_oprof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_oprof_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_oprof_la-libmesh.lo `test -f 'src/base/libmesh.C' || echo '$(srcdir)/'`src/base/libmesh.C +src/base/libmesh_oprof_la-libmesh_singleton.lo: src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_oprof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_oprof_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_oprof_la-libmesh_singleton.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_oprof_la-libmesh_singleton.Tpo -c -o src/base/libmesh_oprof_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_oprof_la-libmesh_singleton.Tpo src/base/$(DEPDIR)/libmesh_oprof_la-libmesh_singleton.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/base/libmesh_singleton.C' object='src/base/libmesh_oprof_la-libmesh_singleton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_oprof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_oprof_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_oprof_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C + src/base/libmesh_oprof_la-periodic_boundaries.lo: src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_oprof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_oprof_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_oprof_la-periodic_boundaries.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_oprof_la-periodic_boundaries.Tpo -c -o src/base/libmesh_oprof_la-periodic_boundaries.lo `test -f 'src/base/periodic_boundaries.C' || echo '$(srcdir)/'`src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_oprof_la-periodic_boundaries.Tpo src/base/$(DEPDIR)/libmesh_oprof_la-periodic_boundaries.Plo @@ -20615,6 +20657,13 @@ src/base/libmesh_opt_la-libmesh.lo: src/base/libmesh.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_opt_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_opt_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_opt_la-libmesh.lo `test -f 'src/base/libmesh.C' || echo '$(srcdir)/'`src/base/libmesh.C +src/base/libmesh_opt_la-libmesh_singleton.lo: src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_opt_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_opt_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_opt_la-libmesh_singleton.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_opt_la-libmesh_singleton.Tpo -c -o src/base/libmesh_opt_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_opt_la-libmesh_singleton.Tpo src/base/$(DEPDIR)/libmesh_opt_la-libmesh_singleton.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/base/libmesh_singleton.C' object='src/base/libmesh_opt_la-libmesh_singleton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_opt_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_opt_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_opt_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C + src/base/libmesh_opt_la-periodic_boundaries.lo: src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_opt_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_opt_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_opt_la-periodic_boundaries.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_opt_la-periodic_boundaries.Tpo -c -o src/base/libmesh_opt_la-periodic_boundaries.lo `test -f 'src/base/periodic_boundaries.C' || echo '$(srcdir)/'`src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_opt_la-periodic_boundaries.Tpo src/base/$(DEPDIR)/libmesh_opt_la-periodic_boundaries.Plo @@ -23380,6 +23429,13 @@ src/base/libmesh_prof_la-libmesh.lo: src/base/libmesh.C @AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ @am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_prof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_prof_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_prof_la-libmesh.lo `test -f 'src/base/libmesh.C' || echo '$(srcdir)/'`src/base/libmesh.C +src/base/libmesh_prof_la-libmesh_singleton.lo: src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_prof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_prof_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_prof_la-libmesh_singleton.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_prof_la-libmesh_singleton.Tpo -c -o src/base/libmesh_prof_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C +@am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_prof_la-libmesh_singleton.Tpo src/base/$(DEPDIR)/libmesh_prof_la-libmesh_singleton.Plo +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ $(AM_V_CXX)source='src/base/libmesh_singleton.C' object='src/base/libmesh_prof_la-libmesh_singleton.lo' libtool=yes @AMDEPBACKSLASH@ +@AMDEP_TRUE@@am__fastdepCXX_FALSE@ DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@ +@am__fastdepCXX_FALSE@ $(AM_V_CXX@am__nodep@)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_prof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_prof_la_CXXFLAGS) $(CXXFLAGS) -c -o src/base/libmesh_prof_la-libmesh_singleton.lo `test -f 'src/base/libmesh_singleton.C' || echo '$(srcdir)/'`src/base/libmesh_singleton.C + src/base/libmesh_prof_la-periodic_boundaries.lo: src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_CXX)$(LIBTOOL) $(AM_V_lt) --tag=CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libmesh_prof_la_CPPFLAGS) $(CPPFLAGS) $(libmesh_prof_la_CXXFLAGS) $(CXXFLAGS) -MT src/base/libmesh_prof_la-periodic_boundaries.lo -MD -MP -MF src/base/$(DEPDIR)/libmesh_prof_la-periodic_boundaries.Tpo -c -o src/base/libmesh_prof_la-periodic_boundaries.lo `test -f 'src/base/periodic_boundaries.C' || echo '$(srcdir)/'`src/base/periodic_boundaries.C @am__fastdepCXX_TRUE@ $(AM_V_at)$(am__mv) src/base/$(DEPDIR)/libmesh_prof_la-periodic_boundaries.Tpo src/base/$(DEPDIR)/libmesh_prof_la-periodic_boundaries.Plo diff --git a/include/Makefile.in b/include/Makefile.in index 5a00d37a376..b0bdb85f3bc 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -512,6 +512,7 @@ include_HEADERS = \ base/libmesh_documentation.h \ base/libmesh_exceptions.h \ base/libmesh_logging.h \ + base/libmesh_singleton.h \ base/libmesh_version.h \ base/multi_predicates.h \ base/periodic_boundaries.h \ diff --git a/include/base/libmesh_singleton.h b/include/base/libmesh_singleton.h new file mode 100644 index 00000000000..2bb2556ee0b --- /dev/null +++ b/include/base/libmesh_singleton.h @@ -0,0 +1,55 @@ +// The libMesh Finite Element Library. +// Copyright (C) 2002-2013 Benjamin S. Kirk, John W. Peterson, Roy H. Stogner + +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. + +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + +#ifndef LIBMESH_LIBMESH_SINGLETON_H +#define LIBMESH_LIBMESH_SINGLETON_H + +#include "libmesh/libmesh_common.h" + +namespace libMesh { + + /** + * Base class for all library singleton objects. + */ + class Singleton + { + protected: + + /** + * Constructor. Adds the derived object to the singleton cache list. + */ + Singleton(); + + /** + * Destructor. + */ + virtual ~Singleton(); + + public: + + /** + * Cleanup function. Removes all dynamically created \p Singleton + * objects. + */ + static void cleanup(); + }; + +} // namespace libMesh + +#endif // LIBMESH_LIBMESH_SINGLETON_H diff --git a/include/include_HEADERS b/include/include_HEADERS index 5e3ac46558d..178e20af64f 100644 --- a/include/include_HEADERS +++ b/include/include_HEADERS @@ -31,6 +31,7 @@ include_HEADERS = \ base/libmesh_documentation.h \ base/libmesh_exceptions.h \ base/libmesh_logging.h \ + base/libmesh_singleton.h \ base/libmesh_version.h \ base/multi_predicates.h \ base/periodic_boundaries.h \ diff --git a/include/libmesh/Makefile.am b/include/libmesh/Makefile.am index df2746b54d0..794289a08ef 100644 --- a/include/libmesh/Makefile.am +++ b/include/libmesh/Makefile.am @@ -5,7 +5,7 @@ # include the magic script! EXTRA_DIST = rebuild_makefile.sh -BUILT_SOURCES = auto_ptr.h dirichlet_boundaries.h dof_map.h dof_object.h factory.h getpot.h id_types.h libmesh.h libmesh_C_isnan.h libmesh_augment_std_namespace.h libmesh_base.h libmesh_common.h libmesh_documentation.h libmesh_exceptions.h libmesh_logging.h libmesh_version.h multi_predicates.h periodic_boundaries.h periodic_boundary.h periodic_boundary_base.h print_trace.h reference_counted_object.h reference_counter.h single_predicates.h sparsity_pattern.h variable.h variant_filter_iterator.h enum_eigen_solver_type.h enum_elem_quality.h enum_elem_type.h enum_fe_family.h enum_inf_map_type.h enum_io_package.h enum_norm_type.h enum_order.h enum_parallel_type.h enum_point_locator_type.h enum_preconditioner_type.h enum_quadrature_type.h enum_solver_package.h enum_solver_type.h enum_subset_solve_mode.h enum_xdr_mode.h adjoint_refinement_estimator.h adjoint_residual_error_estimator.h discontinuity_measure.h error_estimator.h exact_error_estimator.h exact_solution.h fourth_error_estimators.h hp_coarsentest.h hp_selector.h hp_singular.h jump_error_estimator.h kelly_error_estimator.h patch_recovery_error_estimator.h uniform_refinement_estimator.h weighted_patch_recovery_error_estimator.h fe.h fe_abstract.h fe_base.h fe_compute_data.h fe_interface.h fe_macro.h fe_map.h fe_transformation_base.h fe_type.h fe_xyz_map.h h1_fe_transformation.h hcurl_fe_transformation.h inf_fe.h inf_fe_instantiate_1D.h inf_fe_instantiate_2D.h inf_fe_instantiate_3D.h inf_fe_macro.h cell.h cell_hex.h cell_hex20.h cell_hex27.h cell_hex8.h cell_inf.h cell_inf_hex.h cell_inf_hex16.h cell_inf_hex18.h cell_inf_hex8.h cell_inf_prism.h cell_inf_prism12.h cell_inf_prism6.h cell_prism.h cell_prism15.h cell_prism18.h cell_prism6.h cell_pyramid.h cell_pyramid5.h cell_tet.h cell_tet10.h cell_tet4.h edge.h edge_edge2.h edge_edge3.h edge_edge4.h edge_inf_edge2.h elem.h elem_quality.h elem_range.h elem_type.h face.h face_inf_quad.h face_inf_quad4.h face_inf_quad6.h face_quad.h face_quad4.h face_quad8.h face_quad9.h face_tri.h face_tri3.h face_tri6.h node.h node_elem.h node_range.h plane.h point.h remote_elem.h side.h sphere.h stored_range.h surface.h abaqus_io.h boundary_info.h boundary_mesh.h diva_io.h ensight_io.h exodusII_io.h exodusII_io_helper.h fro_io.h gmsh_io.h gmv_io.h gnuplot_io.h inf_elem_builder.h legacy_xdr_io.h matlab_io.h medit_io.h mesh.h mesh_base.h mesh_communication.h mesh_data.h mesh_function.h mesh_generation.h mesh_input.h mesh_inserter_iterator.h mesh_modification.h mesh_output.h mesh_refinement.h mesh_serializer.h mesh_smoother.h mesh_smoother_laplace.h mesh_smoother_vsmoother.h mesh_tetgen_interface.h mesh_tetgen_wrapper.h mesh_tools.h mesh_triangle_holes.h mesh_triangle_interface.h mesh_triangle_wrapper.h nemesis_io.h nemesis_io_helper.h off_io.h parallel_mesh.h patch.h postscript_io.h serial_mesh.h tecplot_io.h tetgen_io.h ucd_io.h unstructured_mesh.h unv_io.h vtk_io.h xdr_head.h xdr_io.h xdr_mesh.h xdr_mgf.h xdr_mhead.h xdr_shead.h xdr_soln.h analytic_function.h const_fem_function.h const_function.h coupling_matrix.h dense_matrix.h dense_matrix_base.h dense_submatrix.h dense_subvector.h dense_vector.h dense_vector_base.h distributed_vector.h eigen_core_support.h eigen_preconditioner.h eigen_sparse_matrix.h eigen_sparse_vector.h fem_function_base.h function_base.h laspack_matrix.h laspack_vector.h numeric_vector.h parsed_function.h petsc_macro.h petsc_matrix.h petsc_preconditioner.h petsc_vector.h preconditioner.h raw_accessor.h refinement_selector.h shell_matrix.h sparse_matrix.h sparse_shell_matrix.h sum_shell_matrix.h tensor_shell_matrix.h tensor_tools.h tensor_value.h trilinos_epetra_matrix.h trilinos_epetra_vector.h trilinos_preconditioner.h type_n_tensor.h type_tensor.h type_vector.h vector_value.h wrapped_function.h zero_function.h parallel.h parallel_algebra.h parallel_bin_sorter.h parallel_conversion_utils.h parallel_ghost_sync.h parallel_hilbert.h parallel_histogram.h parallel_implementation.h parallel_sort.h threads.h threads_allocators.h centroid_partitioner.h hilbert_sfc_partitioner.h linear_partitioner.h metis_partitioner.h morton_sfc_partitioner.h parmetis_partitioner.h partitioner.h sfc_partitioner.h diff_physics.h diff_qoi.h fem_physics.h quadrature.h quadrature_clough.h quadrature_conical.h quadrature_gauss.h quadrature_gm.h quadrature_grid.h quadrature_jacobi.h quadrature_monomial.h quadrature_rules.h quadrature_simpson.h quadrature_trap.h derived_rb_construction.h derived_rb_evaluation.h rb_assembly_expansion.h rb_construction.h rb_construction_base.h rb_eim_assembly.h rb_eim_construction.h rb_eim_evaluation.h rb_eim_theta.h rb_evaluation.h rb_parameters.h rb_parametrized.h rb_parametrized_function.h rb_scm_construction.h rb_scm_evaluation.h rb_temporal_discretization.h rb_theta.h rb_theta_expansion.h transient_rb_assembly_expansion.h transient_rb_construction.h transient_rb_evaluation.h transient_rb_theta_expansion.h direct_solution_transfer.h dtk_adapter.h dtk_evaluator.h dtk_solution_transfer.h meshfree_interpolation.h meshfree_solution_transfer.h meshfunction_solution_transfer.h radial_basis_functions.h radial_basis_interpolation.h solution_transfer.h adaptive_time_solver.h diff_solver.h eigen_solver.h eigen_sparse_linear_solver.h eigen_time_solver.h euler2_solver.h euler_solver.h laspack_linear_solver.h linear.h linear_solver.h memory_solution_history.h newton_solver.h no_solution_history.h nonlinear_solver.h petsc_diff_solver.h petsc_dm_nonlinear_solver.h petsc_linear_solver.h petsc_nonlinear_solver.h petscdmlibmesh.h slepc_eigen_solver.h slepc_macro.h solution_history.h solver.h steady_solver.h time_solver.h trilinos_aztec_linear_solver.h trilinos_nox_nonlinear_solver.h twostep_time_solver.h unsteady_solver.h condensed_eigen_system.h continuation_system.h diff_context.h diff_system.h eigen_system.h elem_assembly.h equation_systems.h explicit_system.h fem_context.h fem_system.h frequency_system.h implicit_system.h linear_implicit_system.h newmark_system.h nonlinear_implicit_system.h parameter_vector.h qoi_set.h sensitivity_data.h steady_system.h system.h system_norm.h system_subset.h system_subset_by_subdomain.h transient_system.h compare_types.h error_vector.h hashword.h ignore_warnings.h location_maps.h mapvector.h null_output_iterator.h number_lookups.h ostream_proxy.h parameters.h perf_log.h perfmon.h plt_loader.h point_locator_base.h point_locator_list.h point_locator_tree.h pool_allocator.h restore_warnings.h statistics.h string_to_enum.h timestamp.h tree.h tree_base.h tree_node.h utility.h xdr_cxx.h parallel_communicator_specializations +BUILT_SOURCES = auto_ptr.h dirichlet_boundaries.h dof_map.h dof_object.h factory.h getpot.h id_types.h libmesh.h libmesh_C_isnan.h libmesh_augment_std_namespace.h libmesh_base.h libmesh_common.h libmesh_documentation.h libmesh_exceptions.h libmesh_logging.h libmesh_singleton.h libmesh_version.h multi_predicates.h periodic_boundaries.h periodic_boundary.h periodic_boundary_base.h print_trace.h reference_counted_object.h reference_counter.h single_predicates.h sparsity_pattern.h variable.h variant_filter_iterator.h enum_eigen_solver_type.h enum_elem_quality.h enum_elem_type.h enum_fe_family.h enum_inf_map_type.h enum_io_package.h enum_norm_type.h enum_order.h enum_parallel_type.h enum_point_locator_type.h enum_preconditioner_type.h enum_quadrature_type.h enum_solver_package.h enum_solver_type.h enum_subset_solve_mode.h enum_xdr_mode.h adjoint_refinement_estimator.h adjoint_residual_error_estimator.h discontinuity_measure.h error_estimator.h exact_error_estimator.h exact_solution.h fourth_error_estimators.h hp_coarsentest.h hp_selector.h hp_singular.h jump_error_estimator.h kelly_error_estimator.h patch_recovery_error_estimator.h uniform_refinement_estimator.h weighted_patch_recovery_error_estimator.h fe.h fe_abstract.h fe_base.h fe_compute_data.h fe_interface.h fe_macro.h fe_map.h fe_transformation_base.h fe_type.h fe_xyz_map.h h1_fe_transformation.h hcurl_fe_transformation.h inf_fe.h inf_fe_instantiate_1D.h inf_fe_instantiate_2D.h inf_fe_instantiate_3D.h inf_fe_macro.h cell.h cell_hex.h cell_hex20.h cell_hex27.h cell_hex8.h cell_inf.h cell_inf_hex.h cell_inf_hex16.h cell_inf_hex18.h cell_inf_hex8.h cell_inf_prism.h cell_inf_prism12.h cell_inf_prism6.h cell_prism.h cell_prism15.h cell_prism18.h cell_prism6.h cell_pyramid.h cell_pyramid5.h cell_tet.h cell_tet10.h cell_tet4.h edge.h edge_edge2.h edge_edge3.h edge_edge4.h edge_inf_edge2.h elem.h elem_quality.h elem_range.h elem_type.h face.h face_inf_quad.h face_inf_quad4.h face_inf_quad6.h face_quad.h face_quad4.h face_quad8.h face_quad9.h face_tri.h face_tri3.h face_tri6.h node.h node_elem.h node_range.h plane.h point.h remote_elem.h side.h sphere.h stored_range.h surface.h abaqus_io.h boundary_info.h boundary_mesh.h diva_io.h ensight_io.h exodusII_io.h exodusII_io_helper.h fro_io.h gmsh_io.h gmv_io.h gnuplot_io.h inf_elem_builder.h legacy_xdr_io.h matlab_io.h medit_io.h mesh.h mesh_base.h mesh_communication.h mesh_data.h mesh_function.h mesh_generation.h mesh_input.h mesh_inserter_iterator.h mesh_modification.h mesh_output.h mesh_refinement.h mesh_serializer.h mesh_smoother.h mesh_smoother_laplace.h mesh_smoother_vsmoother.h mesh_tetgen_interface.h mesh_tetgen_wrapper.h mesh_tools.h mesh_triangle_holes.h mesh_triangle_interface.h mesh_triangle_wrapper.h nemesis_io.h nemesis_io_helper.h off_io.h parallel_mesh.h patch.h postscript_io.h serial_mesh.h tecplot_io.h tetgen_io.h ucd_io.h unstructured_mesh.h unv_io.h vtk_io.h xdr_head.h xdr_io.h xdr_mesh.h xdr_mgf.h xdr_mhead.h xdr_shead.h xdr_soln.h analytic_function.h const_fem_function.h const_function.h coupling_matrix.h dense_matrix.h dense_matrix_base.h dense_submatrix.h dense_subvector.h dense_vector.h dense_vector_base.h distributed_vector.h eigen_core_support.h eigen_preconditioner.h eigen_sparse_matrix.h eigen_sparse_vector.h fem_function_base.h function_base.h laspack_matrix.h laspack_vector.h numeric_vector.h parsed_function.h petsc_macro.h petsc_matrix.h petsc_preconditioner.h petsc_vector.h preconditioner.h raw_accessor.h refinement_selector.h shell_matrix.h sparse_matrix.h sparse_shell_matrix.h sum_shell_matrix.h tensor_shell_matrix.h tensor_tools.h tensor_value.h trilinos_epetra_matrix.h trilinos_epetra_vector.h trilinos_preconditioner.h type_n_tensor.h type_tensor.h type_vector.h vector_value.h wrapped_function.h zero_function.h parallel.h parallel_algebra.h parallel_bin_sorter.h parallel_conversion_utils.h parallel_ghost_sync.h parallel_hilbert.h parallel_histogram.h parallel_implementation.h parallel_sort.h threads.h threads_allocators.h centroid_partitioner.h hilbert_sfc_partitioner.h linear_partitioner.h metis_partitioner.h morton_sfc_partitioner.h parmetis_partitioner.h partitioner.h sfc_partitioner.h diff_physics.h diff_qoi.h fem_physics.h quadrature.h quadrature_clough.h quadrature_conical.h quadrature_gauss.h quadrature_gm.h quadrature_grid.h quadrature_jacobi.h quadrature_monomial.h quadrature_rules.h quadrature_simpson.h quadrature_trap.h derived_rb_construction.h derived_rb_evaluation.h rb_assembly_expansion.h rb_construction.h rb_construction_base.h rb_eim_assembly.h rb_eim_construction.h rb_eim_evaluation.h rb_eim_theta.h rb_evaluation.h rb_parameters.h rb_parametrized.h rb_parametrized_function.h rb_scm_construction.h rb_scm_evaluation.h rb_temporal_discretization.h rb_theta.h rb_theta_expansion.h transient_rb_assembly_expansion.h transient_rb_construction.h transient_rb_evaluation.h transient_rb_theta_expansion.h direct_solution_transfer.h dtk_adapter.h dtk_evaluator.h dtk_solution_transfer.h meshfree_interpolation.h meshfree_solution_transfer.h meshfunction_solution_transfer.h radial_basis_functions.h radial_basis_interpolation.h solution_transfer.h adaptive_time_solver.h diff_solver.h eigen_solver.h eigen_sparse_linear_solver.h eigen_time_solver.h euler2_solver.h euler_solver.h laspack_linear_solver.h linear.h linear_solver.h memory_solution_history.h newton_solver.h no_solution_history.h nonlinear_solver.h petsc_diff_solver.h petsc_dm_nonlinear_solver.h petsc_linear_solver.h petsc_nonlinear_solver.h petscdmlibmesh.h slepc_eigen_solver.h slepc_macro.h solution_history.h solver.h steady_solver.h time_solver.h trilinos_aztec_linear_solver.h trilinos_nox_nonlinear_solver.h twostep_time_solver.h unsteady_solver.h condensed_eigen_system.h continuation_system.h diff_context.h diff_system.h eigen_system.h elem_assembly.h equation_systems.h explicit_system.h fem_context.h fem_system.h frequency_system.h implicit_system.h linear_implicit_system.h newmark_system.h nonlinear_implicit_system.h parameter_vector.h qoi_set.h sensitivity_data.h steady_system.h system.h system_norm.h system_subset.h system_subset_by_subdomain.h transient_system.h compare_types.h error_vector.h hashword.h ignore_warnings.h location_maps.h mapvector.h null_output_iterator.h number_lookups.h ostream_proxy.h parameters.h perf_log.h perfmon.h plt_loader.h point_locator_base.h point_locator_list.h point_locator_tree.h pool_allocator.h restore_warnings.h statistics.h string_to_enum.h timestamp.h tree.h tree_base.h tree_node.h utility.h xdr_cxx.h parallel_communicator_specializations DISTCLEANFILES = $(BUILT_SOURCES) @@ -132,6 +132,9 @@ libmesh_exceptions.h: $(top_srcdir)/include/base/libmesh_exceptions.h libmesh_logging.h: $(top_srcdir)/include/base/libmesh_logging.h $(AM_V_GEN)rm -f $@ && $(LN_S) $< $@ +libmesh_singleton.h: $(top_srcdir)/include/base/libmesh_singleton.h + $(AM_V_GEN)rm -f $@ && $(LN_S) $< $@ + libmesh_version.h: $(top_srcdir)/include/base/libmesh_version.h $(AM_V_GEN)rm -f $@ && $(LN_S) $< $@ diff --git a/include/libmesh/Makefile.in b/include/libmesh/Makefile.in index a52701e78e3..4a39e5a03cd 100644 --- a/include/libmesh/Makefile.in +++ b/include/libmesh/Makefile.in @@ -419,9 +419,9 @@ BUILT_SOURCES = auto_ptr.h dirichlet_boundaries.h dof_map.h \ dof_object.h factory.h getpot.h id_types.h libmesh.h \ libmesh_C_isnan.h libmesh_augment_std_namespace.h \ libmesh_base.h libmesh_common.h libmesh_documentation.h \ - libmesh_exceptions.h libmesh_logging.h libmesh_version.h \ - multi_predicates.h periodic_boundaries.h periodic_boundary.h \ - periodic_boundary_base.h print_trace.h \ + libmesh_exceptions.h libmesh_logging.h libmesh_singleton.h \ + libmesh_version.h multi_predicates.h periodic_boundaries.h \ + periodic_boundary.h periodic_boundary_base.h print_trace.h \ reference_counted_object.h reference_counter.h \ single_predicates.h sparsity_pattern.h variable.h \ variant_filter_iterator.h enum_eigen_solver_type.h \ @@ -818,6 +818,9 @@ libmesh_exceptions.h: $(top_srcdir)/include/base/libmesh_exceptions.h libmesh_logging.h: $(top_srcdir)/include/base/libmesh_logging.h $(AM_V_GEN)rm -f $@ && $(LN_S) $< $@ +libmesh_singleton.h: $(top_srcdir)/include/base/libmesh_singleton.h + $(AM_V_GEN)rm -f $@ && $(LN_S) $< $@ + libmesh_version.h: $(top_srcdir)/include/base/libmesh_version.h $(AM_V_GEN)rm -f $@ && $(LN_S) $< $@ diff --git a/src/base/libmesh_singleton.C b/src/base/libmesh_singleton.C new file mode 100644 index 00000000000..bff9973abfd --- /dev/null +++ b/src/base/libmesh_singleton.C @@ -0,0 +1,82 @@ +// The libMesh Finite Element Library. +// Copyright (C) 2002-2013 Benjamin S. Kirk, John W. Peterson, Roy H. Stogner + +// This library is free software; you can redistribute it and/or +// modify it under the terms of the GNU Lesser General Public +// License as published by the Free Software Foundation; either +// version 2.1 of the License, or (at your option) any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +// Lesser General Public License for more details. + +// You should have received a copy of the GNU Lesser General Public +// License along with this library; if not, write to the Free Software +// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + + + +// Local includes +#include "libmesh/libmesh_singleton.h" +#include "libmesh/threads.h" + +// C/C++ includes +#include + + +// -------------------------------------------------------- +// Local anonymous namespace to hold miscelaneous bits +namespace +{ + using namespace libMesh; + + // Mutex object for required locking + typedef Threads::spin_mutex SingletonMutex; + SingletonMutex singleton_mtx; + + // global list of runtime Singleton objects - created dynamically, + // cleaned up in reverse order. + typedef std::vector SingletonList; + SingletonList singleton_cache; + +} // end anonymous namespace + + + +// -------------------------------------------------------- +// Local anonymous namespace to hold miscelaneous bits +namespace libMesh +{ + + Singleton::Singleton () + { + SingletonMutex::scoped_lock lock(singleton_mtx); + + singleton_cache.push_back (this); + } + + + + Singleton::~Singleton () + { + } + + + + void Singleton::cleanup () + { + SingletonMutex::scoped_lock lock(singleton_mtx); + + for (SingletonList::reverse_iterator it = singleton_cache.rbegin(); + it!=singleton_cache.rend(); ++it) + { + libmesh_assert (*it != NULL); + delete *it; + *it = NULL; + } + + singleton_cache.clear(); + } + +} // namespace libMesh diff --git a/src/libmesh_SOURCES b/src/libmesh_SOURCES index 91c0c634f06..b691f76e0f0 100644 --- a/src/libmesh_SOURCES +++ b/src/libmesh_SOURCES @@ -5,6 +5,7 @@ libmesh_SOURCES = \ src/base/dof_object.C \ src/base/libmesh.C \ src/base/libmesh_isnan.c \ + src/base/libmesh_singleton.C \ src/base/periodic_boundaries.C \ src/base/periodic_boundary.C \ src/base/periodic_boundary_base.C \