]> https://gitweb.dealii.org/ - dealii.git/commitdiff
Update to new library call syntax.
authorWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 18 Mar 1998 15:43:57 +0000 (15:43 +0000)
committerWolfgang Bangerth <bangerth@math.tamu.edu>
Wed, 18 Mar 1998 15:43:57 +0000 (15:43 +0000)
git-svn-id: https://svn.dealii.org/trunk@80 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/deal.II/Attic/examples/Makefile
deal.II/deal.II/Attic/examples/poisson/poisson.cc
tests/big-tests/Makefile
tests/big-tests/poisson/poisson.cc

index f40c158b70b349ddaec9a4e098df28930c4bdc76..6c77979105208df48a0d3030c4ed59cbbbad1701 100644 (file)
@@ -6,8 +6,12 @@ CXXFLAGS.g= -DDEBUG -g -Wall $(INCPATH)
 CXXFLAGS  = -O3 $(INCPATH)
 
 LIBPATH   = -L../lib -L../../lac/lib
+LIBFILES.g= ../lib/libbasic.g.a ../lib/libgrid.g.a \
+            ../lib/libfe.g.a ../lib/libnumerics.g.a \
+            ../../lac/lib/liblac.g.a
+LIBFILES  = $(LIBFILES.g:.g.a=.a)
 LIBS.g    = $(LIBPATH) -lbasic.g -lgrid.g -lfe.g -lnumerics.g -llac.g
-LIBS      = $(LIBPATH) -lbasic -lgrid -lfe -lnumerics 
+LIBS      = $(LIBS.g:.g=)
 
 ifeq ($(shell uname),SunOS)
 CXXFLAGS  := -V2.7.2.3 $(CXXFLAGS)
@@ -25,15 +29,15 @@ examples: $(cc-files:.cc=)
        @echo ================= Compiling $<
        @$(CXX) $(CXXFLAGS.g) -o $@ -g -c $<
 
-grid/grid_test: grid/grid_test.o
+grid/grid_test: grid/grid_test.o $(LIBFILES)
        @echo ================= Linking $@
        @$(CXX) $(CXXFLAGS) -o $@ $< $(LIBS)
 
-dof/dof_test: dof/dof_test.o
+dof/dof_test: dof/dof_test.o $(LIBFILES.g)
        @echo ================= Linking $@
        @$(CXX) $(CXXFLAGS.g) -o $@ $< $(LIBS.g) -lg++
 
-poisson/poisson: poisson/poisson.o
+poisson/poisson: poisson/poisson.o $(LIBFILES.g)
        @echo ================= Linking $@
        @$(CXX) $(CXXFLAGS.g) -g -o $@ $< ../../mia/control.o $(LIBS.g) -lg++
 
index 9c4c8b9151884ac79b2d46b7e0b1ca3671cf72a4..d7761bbc5995dcff6c812c18027240cf340e05a7 100644 (file)
@@ -34,7 +34,7 @@ class PoissonEquation :  public Equation<dim> {
                    Equation<dim>(1) {};
 
     virtual void assemble (dFMatrix            &cell_matrix,
-                          vector<dVector>     &rhs,
+                          dVector             &rhs,
                           const FEValues<dim> &fe_values,
                           const Triangulation<dim>::cell_iterator &cell) const;
     double right_hand_side (const Point<dim> &) const;
@@ -59,6 +59,8 @@ double PoissonEquation<dim>::right_hand_side (const Point<dim> &p) const {
                    - 3./2.*(p(0)*p(0)+p(1)*p(1))
                    - 6*(p(0)+p(1))
                    + 6);
+//         return 1.;
+           
       default:
            return 0;
     };
@@ -67,7 +69,7 @@ double PoissonEquation<dim>::right_hand_side (const Point<dim> &p) const {
 
 
 void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
-                                  vector<dVector>     &rhs,
+                                  dVector             &rhs,
                                   const FEValues<1>   &fe_values,
                                   const Triangulation<1>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
@@ -79,16 +81,16 @@ void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
                               fe_values.shape_value(i,point) *
                               fe_values.shape_value(j,point)) *
                              fe_values.JxW(point);
-       rhs[0](i) += fe_values.shape_value(i,point) *
-                    right_hand_side(fe_values.quadrature_point(point)) *
-                    fe_values.JxW(point);
+       rhs(i) += fe_values.shape_value(i,point) *
+                 right_hand_side(fe_values.quadrature_point(point)) *
+                 fe_values.JxW(point);
       };
 };
 
 
 
 void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
-                                  vector<dVector>     &rhs,
+                                  dVector             &rhs,
                                   const FEValues<2>   &fe_values,
                                   const Triangulation<2>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
@@ -100,9 +102,9 @@ void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
                               fe_values.shape_value(i,point) *
                               fe_values.shape_value(j,point)) *
                              fe_values.JxW(point);
-       rhs[0](i) += fe_values.shape_value(i,point) *
-                    right_hand_side(fe_values.quadrature_point(point)) *
-                    fe_values.JxW(point);
+       rhs(i) += fe_values.shape_value(i,point) *
+                 right_hand_side(fe_values.quadrature_point(point)) *
+                 fe_values.JxW(point);
       };
 };
 
@@ -120,23 +122,25 @@ int main () {
                                   
 //  HyperBallBoundary<2> boundary(Point<2>(2,3), 4);
 
+  cout << "Making grid..." << endl;
+  
   tria.create_hypercube ();
 //  tria.create_hyper_ball(Point<2>(2,3),4);
 //  tria.set_boundary (&boundary);
   
 /*  tria.refine_global (1);
-  tria.begin_active()->set_refine_flag();
+  (--tria.last_active())->set_refine_flag();
+  tria.execute_refinement ();
+  tria.begin_active(2)->set_refine_flag();
   tria.execute_refinement ();
-  tria.refine_global (3);
+  tria.refine_global (2);
 */
 
-  cout << "Making grid..." << endl;
-  
   const unsigned int dim=2;
   tria.refine_global (1);
        
   Triangulation<dim>::active_cell_iterator cell, endc;
-  for (int i=0; i<8; ++i) 
+  for (int i=0; i<12; ++i) 
     {
       int n_levels = tria.n_levels();
       cell = tria.begin_active();
@@ -157,8 +161,10 @@ int main () {
     };
   tria.refine_global (1);
   
-  cout << "Distributing dofs..." << endl; 
+
+  cout << "Distributing dofs... "; 
   dof.distribute_dofs (fe);
+  cout << dof.n_dofs() << " degrees of freedom." << endl;
 
   cout << "Assembling matrices..." << endl;
   problem.assemble (equation, quadrature, fe);
index f40c158b70b349ddaec9a4e098df28930c4bdc76..6c77979105208df48a0d3030c4ed59cbbbad1701 100644 (file)
@@ -6,8 +6,12 @@ CXXFLAGS.g= -DDEBUG -g -Wall $(INCPATH)
 CXXFLAGS  = -O3 $(INCPATH)
 
 LIBPATH   = -L../lib -L../../lac/lib
+LIBFILES.g= ../lib/libbasic.g.a ../lib/libgrid.g.a \
+            ../lib/libfe.g.a ../lib/libnumerics.g.a \
+            ../../lac/lib/liblac.g.a
+LIBFILES  = $(LIBFILES.g:.g.a=.a)
 LIBS.g    = $(LIBPATH) -lbasic.g -lgrid.g -lfe.g -lnumerics.g -llac.g
-LIBS      = $(LIBPATH) -lbasic -lgrid -lfe -lnumerics 
+LIBS      = $(LIBS.g:.g=)
 
 ifeq ($(shell uname),SunOS)
 CXXFLAGS  := -V2.7.2.3 $(CXXFLAGS)
@@ -25,15 +29,15 @@ examples: $(cc-files:.cc=)
        @echo ================= Compiling $<
        @$(CXX) $(CXXFLAGS.g) -o $@ -g -c $<
 
-grid/grid_test: grid/grid_test.o
+grid/grid_test: grid/grid_test.o $(LIBFILES)
        @echo ================= Linking $@
        @$(CXX) $(CXXFLAGS) -o $@ $< $(LIBS)
 
-dof/dof_test: dof/dof_test.o
+dof/dof_test: dof/dof_test.o $(LIBFILES.g)
        @echo ================= Linking $@
        @$(CXX) $(CXXFLAGS.g) -o $@ $< $(LIBS.g) -lg++
 
-poisson/poisson: poisson/poisson.o
+poisson/poisson: poisson/poisson.o $(LIBFILES.g)
        @echo ================= Linking $@
        @$(CXX) $(CXXFLAGS.g) -g -o $@ $< ../../mia/control.o $(LIBS.g) -lg++
 
index 9c4c8b9151884ac79b2d46b7e0b1ca3671cf72a4..d7761bbc5995dcff6c812c18027240cf340e05a7 100644 (file)
@@ -34,7 +34,7 @@ class PoissonEquation :  public Equation<dim> {
                    Equation<dim>(1) {};
 
     virtual void assemble (dFMatrix            &cell_matrix,
-                          vector<dVector>     &rhs,
+                          dVector             &rhs,
                           const FEValues<dim> &fe_values,
                           const Triangulation<dim>::cell_iterator &cell) const;
     double right_hand_side (const Point<dim> &) const;
@@ -59,6 +59,8 @@ double PoissonEquation<dim>::right_hand_side (const Point<dim> &p) const {
                    - 3./2.*(p(0)*p(0)+p(1)*p(1))
                    - 6*(p(0)+p(1))
                    + 6);
+//         return 1.;
+           
       default:
            return 0;
     };
@@ -67,7 +69,7 @@ double PoissonEquation<dim>::right_hand_side (const Point<dim> &p) const {
 
 
 void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
-                                  vector<dVector>     &rhs,
+                                  dVector             &rhs,
                                   const FEValues<1>   &fe_values,
                                   const Triangulation<1>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
@@ -79,16 +81,16 @@ void PoissonEquation<1>::assemble (dFMatrix            &cell_matrix,
                               fe_values.shape_value(i,point) *
                               fe_values.shape_value(j,point)) *
                              fe_values.JxW(point);
-       rhs[0](i) += fe_values.shape_value(i,point) *
-                    right_hand_side(fe_values.quadrature_point(point)) *
-                    fe_values.JxW(point);
+       rhs(i) += fe_values.shape_value(i,point) *
+                 right_hand_side(fe_values.quadrature_point(point)) *
+                 fe_values.JxW(point);
       };
 };
 
 
 
 void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
-                                  vector<dVector>     &rhs,
+                                  dVector             &rhs,
                                   const FEValues<2>   &fe_values,
                                   const Triangulation<2>::cell_iterator &) const {
   for (unsigned int point=0; point<fe_values.n_quadrature_points; ++point)
@@ -100,9 +102,9 @@ void PoissonEquation<2>::assemble (dFMatrix            &cell_matrix,
                               fe_values.shape_value(i,point) *
                               fe_values.shape_value(j,point)) *
                              fe_values.JxW(point);
-       rhs[0](i) += fe_values.shape_value(i,point) *
-                    right_hand_side(fe_values.quadrature_point(point)) *
-                    fe_values.JxW(point);
+       rhs(i) += fe_values.shape_value(i,point) *
+                 right_hand_side(fe_values.quadrature_point(point)) *
+                 fe_values.JxW(point);
       };
 };
 
@@ -120,23 +122,25 @@ int main () {
                                   
 //  HyperBallBoundary<2> boundary(Point<2>(2,3), 4);
 
+  cout << "Making grid..." << endl;
+  
   tria.create_hypercube ();
 //  tria.create_hyper_ball(Point<2>(2,3),4);
 //  tria.set_boundary (&boundary);
   
 /*  tria.refine_global (1);
-  tria.begin_active()->set_refine_flag();
+  (--tria.last_active())->set_refine_flag();
+  tria.execute_refinement ();
+  tria.begin_active(2)->set_refine_flag();
   tria.execute_refinement ();
-  tria.refine_global (3);
+  tria.refine_global (2);
 */
 
-  cout << "Making grid..." << endl;
-  
   const unsigned int dim=2;
   tria.refine_global (1);
        
   Triangulation<dim>::active_cell_iterator cell, endc;
-  for (int i=0; i<8; ++i) 
+  for (int i=0; i<12; ++i) 
     {
       int n_levels = tria.n_levels();
       cell = tria.begin_active();
@@ -157,8 +161,10 @@ int main () {
     };
   tria.refine_global (1);
   
-  cout << "Distributing dofs..." << endl; 
+
+  cout << "Distributing dofs... "; 
   dof.distribute_dofs (fe);
+  cout << dof.n_dofs() << " degrees of freedom." << endl;
 
   cout << "Assembling matrices..." << endl;
   problem.assemble (equation, quadrature, fe);

In the beginning the Universe was created. This has made a lot of people very angry and has been widely regarded as a bad move.

Douglas Adams


Typeset in Trocchi and Trocchi Bold Sans Serif.