]> https://gitweb.dealii.org/ - dealii-svn.git/commitdiff
Prefix math functions by std::
authorwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 30 Apr 2002 15:16:13 +0000 (15:16 +0000)
committerwolf <wolf@0785d39b-7218-0410-832d-ea1e28bc413d>
Tue, 30 Apr 2002 15:16:13 +0000 (15:16 +0000)
git-svn-id: https://svn.dealii.org/trunk@5771 0785d39b-7218-0410-832d-ea1e28bc413d

deal.II/examples/step-14/step-14.cc

index 754b18ae9a12c16f1786c8809174232d6a8b3f1d..0ffe1c8c37eafa2fc235a522a9709cae662185ba 100644 (file)
@@ -1451,8 +1451,8 @@ namespace Data
   {
     double q = p(0);
     for (unsigned int i=1; i<dim; ++i)
-      q += sin(10*p(i)+5*p(0)*p(0));
-    const double exponential = exp(q);
+      q += std::sin(10*p(i)+5*p(0)*p(0));
+    const double exponential = std::exp(q);
     return exponential;
   };
 
@@ -1465,18 +1465,18 @@ namespace Data
   {
     double q = p(0);
     for (unsigned int i=1; i<dim; ++i)
-      q += sin(10*p(i)+5*p(0)*p(0));
-    const double u = exp(q);
+      q += std::sin(10*p(i)+5*p(0)*p(0));
+    const double u = std::exp(q);
     double t1 = 1,
           t2 = 0,
           t3 = 0;
     for (unsigned int i=1; i<dim; ++i)
       {
-       t1 += cos(10*p(i)+5*p(0)*p(0)) * 10 * p(0);
-       t2 += 10*cos(10*p(i)+5*p(0)*p(0)) -
-             100*sin(10*p(i)+5*p(0)*p(0)) * p(0)*p(0);
-       t3 += 100*cos(10*p(i)+5*p(0)*p(0))*cos(10*p(i)+5*p(0)*p(0)) -
-             100*sin(10*p(i)+5*p(0)*p(0));
+       t1 += std::cos(10*p(i)+5*p(0)*p(0)) * 10 * p(0);
+       t2 += 10*std::cos(10*p(i)+5*p(0)*p(0)) -
+             100*std::sin(10*p(i)+5*p(0)*p(0)) * p(0)*p(0);
+       t3 += 100*std::cos(10*p(i)+5*p(0)*p(0))*std::cos(10*p(i)+5*p(0)*p(0)) -
+             100*std::sin(10*p(i)+5*p(0)*p(0));
       };
     t1 = t1*t1;
     
@@ -2978,7 +2978,7 @@ namespace LaplaceSolver
                                     n_threads, i,
                                     error_indicators,
                                     face_integrals));
-    thread_manager.wait();
+    thread_manager.wait();    
 
                                     // Once the error contributions
                                     // are computed, sum them up. For
@@ -3227,7 +3227,7 @@ namespace LaplaceSolver
             ++t, ++cell, ++cell_index);
        if (cell == DualSolver<dim>::dof_handler.end())
          break;
-      };    
+      };
   };
 
 

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.