Mercurial > hg > kwantix

changeset 47:6cdad791f16f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add -g to debug builds; remove obsolete Makefile; fiddle with sw-rk4
author Jordi Gutiérrez Hermoso <jordigh@gmail.com>
date Tue, 23 Mar 2010 23:18:25 -0600
parents 1ff029128e08
children 6f9071675ee7
files src/CMakeLists.txt src/include/Makefile src/main-sw-rk4.cpp
diffstat 3 files changed, 5 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -13,7 +13,7 @@
 )
 
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(PEDANTIC_COMPILE_FLAGS "${PEDANTIC_COMPILE_FLAGS} -pg")
+  set(PEDANTIC_COMPILE_FLAGS "${PEDANTIC_COMPILE_FLAGS} -pg -g")
   set(LAX_COMPILE_FLAGS "${LAX_COMPILE_FLAGS} -pg")
 endif()
 
deleted file mode 100644
--- a/src/include/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-all:
-	cd .. && make
-test:
-	cd .. && make test
-
-doc: 
-	cd .. && make doc
\ No newline at end of file
--- a/src/main-sw-rk4.cpp
+++ b/src/main-sw-rk4.cpp
@@ -44,9 +44,6 @@
   void set_interps(const interpolator<RBF>& u0, 
                    const interpolator<RBF>& v0,
                    const interpolator<RBF>& h0);
-  void set_u(const interpolator<RBF>& u0);
-  void set_v(const interpolator<RBF>& v0);
-  void set_h(const interpolator<RBF>& h0);
   void set_dt(double dt_in);
 protected:
   interpolator<RBF> u;
@@ -161,15 +158,15 @@
     f_v.set_dt(dt);
     f_h.set_dt(dt);
 
-    vtkplot plotter(u0,0,0.2);
+    vtkplot plotter(h0,0,0.2);
     plotter.set_view_direction(0,1,1);
     plotter.begin_interaction();
 
     //main loop, timestepping with RK4.
-    size_t maxiter = 20;
+    size_t maxiter = 200;
     for(size_t i = 1; i <= maxiter; i++){ 
       cout << "Now on iteration #" << i << endl;
-      plotter.update_values(u0.at());
+      plotter.update_values(h0.at());
       plotter.plot();
       if(i % 10 == 0){
         save_interp(Omega,u0,i,"u");
@@ -251,27 +248,10 @@
 template<typename RBF>
 void Fgen<RBF>::set_interps(const interpolator<RBF>& u0, 
                             const interpolator<RBF>& v0,
-                            const interpolator<RBF>& h0){
-  set_u(u0);
-  set_v(v0);
-  set_h(h0);
-}
-
-template<typename RBF>
-void Fgen<RBF>::set_u(const interpolator<RBF>& u0)
+                            const interpolator<RBF>& h0)
 {
   u = u0;
-}
-
-template<typename RBF>
-void Fgen<RBF>::set_v(const interpolator<RBF>& v0)
-{
   v = v0;
-}
-
-template<typename RBF>
-void Fgen<RBF>::set_h(const interpolator<RBF>& h0)
-{
   h = h0;
 }
 
@@ -281,7 +261,6 @@
   dt = dt_in;
 }
 
-
 template<typename RBF>
 interp_values Fu<RBF>::at() const
 {