]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Fix some issues with cxx.
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 6 Jul 2001 09:03:59 +0000 (09:03 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Fri, 6 Jul 2001 09:03:59 +0000 (09:03 +0000)
git-svn-id: https://svn.dealii.org/trunk@4826 0785d39b-7218-0410-832d-ea1e28bc413d

tests/base/auto_derivative_function.cc
tests/base/polynomial_test.cc
tests/base/quadrature_test.cc

index a8cbfdfd904783c5f2ee7a141838f6b0bd6e7554..fbdb479554604a303f5772e30f886359af2f24cd 100644 (file)
@@ -55,7 +55,7 @@ template <int dim>
 double AutoSinExp<dim>::value (const Point<dim> &p,
                               const unsigned int) const
 {
-  return sin(2*p(0))*exp(3*p(1));
+  return std::sin(2*p(0))*std::exp(3*p(1));
 }
 
 
@@ -92,8 +92,8 @@ Tensor<1,dim> ExactSinExp<dim>::gradient (const Point<dim> &p,
                                         const unsigned int) const
 {
   Tensor<1,dim> grad;
-  grad[0]=2*cos(2*p(0))*exp(3*p(1));
-  grad[1]=3*sin(2*p(0))*exp(3*p(1));
+  grad[0]=2*std::cos(2*p(0))*std::exp(3*p(1));
+  grad[1]=3*std::sin(2*p(0))*std::exp(3*p(1));
   return grad;
 }
 
@@ -109,7 +109,7 @@ void ExactSinExp<dim>::vector_gradient (const Point<dim>       &p,
 }
 
 
-int main(int, char)
+int main()
 {
   std::ofstream logfile("auto_derivative_function.output");
   logfile.precision(4);
@@ -145,7 +145,7 @@ int main(int, char)
                                           // Test of gradient function
          Tensor<1,dim> a_grad=auto_function.gradient(p);
          a_grad-=u_grad;
-         double value=sqrt(a_grad*a_grad);
+         double value=std::sqrt(a_grad*a_grad);
          history.add_value("grad", value);
          history.set_scientific("grad", true);
          history.set_precision("grad", 2);
@@ -155,7 +155,7 @@ int main(int, char)
          std::vector<Tensor<1,dim> > a_grads(1);
          auto_function.gradient_list(ps, a_grads);
          a_grads[0]-=u_grad;
-         value=sqrt(a_grads[0]*a_grads[0]);
+         value=std::sqrt(a_grads[0]*a_grads[0]);
          history.add_value("grads[0]", value);
          history.set_scientific("grads[0]", true);
          history.set_precision("grads[0]", 2);
@@ -165,7 +165,7 @@ int main(int, char)
          std::vector<Tensor<1,dim> > a_vgrad(2);
          auto_function.vector_gradient(p, a_vgrad);
          a_vgrad[1]-=u_grad;
-         value=sqrt(a_vgrad[1]*a_vgrad[1]);
+         value=std::sqrt(a_vgrad[1]*a_vgrad[1]);
          history.add_value("vgrad[1]", value);
          history.set_scientific("vgrad[1]", true);
          history.set_precision("vgrad[1]", 2);
@@ -177,7 +177,7 @@ int main(int, char)
            a_vgrads(1, std::vector<Tensor<1,dim> > (2));
          auto_function.vector_gradient_list(ps, a_vgrads);
          a_vgrads[0][1]-=u_grad;
-         value=sqrt(a_vgrads[0][1]*a_vgrads[0][1]);
+         value=std::sqrt(a_vgrads[0][1]*a_vgrads[0][1]);
          history.add_value("vgrads[1]", value);
          history.set_scientific("vgrads[1]", true);
          history.set_precision("vgrads[1]", 2);
index ba6bb47adec3f518175dba260bd2b72d09b065ff..841a5aea7b390f7698a8a18ba416f5a8bad5e584 100644 (file)
 #include <base/tensor_product_polynomials.h>
 
 
+extern "C"
+void abort()
+{}
+
+
 
 bool equals_delta_ij(double value, unsigned int i, unsigned int j)
 {
@@ -36,7 +41,7 @@ void Q3_4th_shape_function_values_and_grads_dim2(
 
 
 
-int main(int, char)
+int main()
 {
   std::ofstream logfile("polynomial_test.output");
   logfile.precision(4);
index 848aed80f05082bc051381efe83399e6aaba7f53..c7d3d887adc693bf472ecf42665377e670ee903a 100644 (file)
@@ -71,18 +71,18 @@ check_cells (std::vector<Quadrature<dim>*>& quadratures)
              switch (dim)
                {
                case 3:
-                 f *= pow(points[x](2), i);
+                 f *= std::pow(static_cast<double>(points[x](2)), i*1.0);
                case 2:
-                 f *= pow(points[x](1), i);
+                 f *= std::pow(static_cast<double>(points[x](1)), i*1.0);
                case 1:
-                 f *= pow(points[x](0), i);
+                 f *= std::pow(static_cast<double>(points[x](0)), i*1.0);
                }
              quadrature_int+=f*weights[x];
            }
          
                                           // the exact integral is 1/(i+1)
-         exact_int=1./pow(i+1,dim);      
-         err = fabs(quadrature_int-exact_int);
+         exact_int=1./std::pow(static_cast<double>(i+1),dim);    
+         err = std::fabs(quadrature_int-exact_int);
        }
       while (err<1e-15);
                                       // Uncomment here for testing
@@ -144,11 +144,11 @@ check_faces (const std::vector<Quadrature<dim-1>*>& quadratures, const bool sub)
              switch (dim)
                {
                case 3:
-                 f *= pow(points[x](2), i);
+                 f *= std::pow(points[x](2), i*1.0);
                case 2:
-                 f *= pow(points[x](1), i);
+                 f *= std::pow(points[x](1), i*1.0);
                case 1:
-                 f *= pow(points[x](0), i);
+                 f *= std::pow(points[x](0), i*1.0);
                }
              quadrature_int+=f*weights[x];
            }
@@ -165,7 +165,7 @@ check_faces (const std::vector<Quadrature<dim-1>*>& quadratures, const bool sub)
              break;
            }
       
-         err = fabs(quadrature_int-exact_int);
+         err = std::fabs(quadrature_int-exact_int);
        }
       while (err<5e-15);
                                       // Uncomment here for testing
@@ -175,7 +175,7 @@ check_faces (const std::vector<Quadrature<dim-1>*>& quadratures, const bool sub)
   deallog.pop();
 }
 
-int main(int,char)
+int main()
 {
   std::ofstream logfile("quadrature_test.output");
   deallog.attach(logfile);
@@ -194,14 +194,14 @@ int main(int,char)
 
   deallog.push("2d");
   check_cells(q2);
-  check_faces(q1,false);
-  check_faces(q1,true);
+  check_faces<2>(q1,false);
+  check_faces<2>(q1,true);
   deallog.pop();
 
   deallog.push("3d");
   check_cells(q3);
-  check_faces(q2,false);
-  check_faces(q2,true);
+  check_faces<3>(q2,false);
+  check_faces<3>(q2,true);
   deallog.pop();
 
                                   // delete objects again to avoid

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.