Merge pull request #297 from trontrytel/sqr

fixing cone shape for rotating cone test
igfuw · Mar 31, 2015 · 67db5b8 · 67db5b8
2 parents 31b4d01 + 7c1a3b3
commit 67db5b8
Show file tree

Hide file tree

Showing 7 changed files with 4 additions and 4 deletions.
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/log-orig.gz b/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/log-orig.gz
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_basic_.txt.gz b/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_basic_.txt.gz
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_fct_.txt.gz b/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_fct_.txt.gz
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_iga_fct_.txt.gz b/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_iga_fct_.txt.gz
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_iga_tot_fct_.txt.gz b/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_iga_tot_fct_.txt.gz
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_iters3_tot_fct_.txt.gz b/tests/paper_2015_GMD/3_rotating_cone_2d/refdata/stats_iters3_tot_fct_.txt.gz
diff --git a/tests/paper_2015_GMD/3_rotating_cone_2d/rotating_cone_2d.cpp b/tests/paper_2015_GMD/3_rotating_cone_2d/rotating_cone_2d.cpp
@@ -72,7 +72,7 @@ void test(const std::string filename)
   }
   p.gnuplot_view = "map";
   p.gnuplot_with = "lines";
-  p.gnuplot_surface = false;
+  p.gnuplot_surface = false; 
   p.gnuplot_contour = true;
   {
     std::ostringstream tmp;
@@ -136,9 +136,9 @@ void test(const std::string filename)
 
     // ... cut off at zero
     run.advectee() = h0 + where(
-      tmp - pow(r, 2) <= 0,                  //if
-      h * blitz::sqr(1 - tmp / pow(r, 2)),   //then
-      0.                                     //else
+      tmp - pow(r, 2) <= 0,                // if
+      h - blitz::sqrt(tmp / pow(r/h,2)),   // then  
+      0.                                   // else
     );
 
     // constant-angular-velocity rotational field