Mercurial > hg > kwantix

changeset 48:6f9071675ee7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove some unnecessary Octaviz files, twiddle params, fix vtkplot template instantiations
author Jordi Gutiérrez Hermoso <jordigh@gmail.com>
date Tue, 30 Mar 2010 01:12:20 -0600
parents 6cdad791f16f
children 7e0d6febb26d
files results/plotresults.m results/plotresults_vtk.m results/showresults.m results/showvecs.m src/main-sw-rk4.cpp src/vtkplot.cpp
diffstat 6 files changed, 17 insertions(+), 105 deletions(-) [+]
line wrap: on
line diff
deleted file mode 100644
--- a/results/plotresults.m
+++ /dev/null
@@ -1,36 +0,0 @@
-r = linspace(0,1,80);
-th = linspace(0,2*pi,60);
-[rr,thth] = meshgrid(r,th);
-[xx,yy] = pol2cart(thth,rr);
-
-skip = 10;
-
-for i = skip:skip:10000
-  name = "h";
-  if(i < 10000);
-    name = strcat(name, "0");
-  endif
-  if(i < 1000);
-    name = strcat(name, "0");
-  endif
-  if(i < 100);
-    name = strcat(name, "0");
-  endif
-  if(i < 10);
-    name = strcat(name, "0");
-  endif
-  name = strcat(name,num2str(i));
-  filename = strcat(name,".map");
-  load(filename);
-  h = eval(name);
-  x = h(:,1); y = h(:,2); z = h(:,3);
-  [xi,yi,zi] = griddata(x,y,z,xx,yy);
-  zi = zi(:,1:end-1);   xi = xi(:,1:end-1);  yi = yi(:,1:end-1);
-  vtk_clear;
-  vtk_surf(xi,yi,zi);
-  vtk_xlim([-1,1]);
-  vtk_ylim([-1,1]);
-  vtk_zlim([0,0.2]);
-  vtk_print(strcat(name,".png"),"-dpng");
-  clear eval(name);
-endfor
deleted file mode 100644
--- a/results/plotresults_vtk.m
+++ /dev/null
@@ -1,29 +0,0 @@
-skip = 1;
-for i = skip:skip:500
-  name = "u";
-  if(i < 10000)
-    name = strcat(name, "0");
-  endif
-  if(i < 1000)
-    name = strcat(name, "0");
-  endif
-  if(i < 100)
-    name = strcat(name, "0");
-  endif
-  if(i < 10)
-    name = strcat(name, "0");
-  endif
-  name = strcat(name,num2str(i));
-  #vtk_xlim([-1,1]);
-  #vtk_ylim([-1,1]);
-  #vtk_zlim([0,0.2]);
-  filename = strcat(name,".map");
-  load(filename);
-  h = eval(name);
-  T = delaunay(h(:,1),h(:,2));
-  vtk_clear; vtk_trisurf(T,h(:,1),h(:,2),h(:,3));
-  ##foo = vtk_trimesh(T,h(:,1),h(:,2),h(:,3));
-  vtk_axis('off');
-  vtk_print(strcat(name,".png"),"-dpng");
-  clear eval(name);
-endfor
deleted file mode 100644
--- a/results/showresults.m
+++ /dev/null
@@ -1,32 +0,0 @@
-r = linspace(0,1,20);
-th = linspace(0,2*pi,30);
-[rr,thth] = meshgrid(r,th);
-[xx,yy] = pol2cart(thth,rr);
-
-for i=1:1000
-  name = "u";
-  if(i < 10000);
-    name = strcat(name, "0");
-  endif
-  if(i < 1000);
-    name = strcat(name, "0");
-  endif
-  if(i < 100);
-    name = strcat(name, "0");
-  endif
-  if(i < 10);
-    name = strcat(name, "0");
-  endif
-  name = strcat(name,num2str(i));
-  name;
-  filename = strcat(name,".matrix");
-  load(filename);		
-  vtk_clear;
-  vtk_xlim([-1,1])
-  vtk_ylim([-1,1])
-  vtk_zlim([-0.5,0.5])
-  vtk_surf(xx,yy,eval(name)');
-  vtk_print(strcat(name,".png"),"-dpng");
-  clear eval(name);
-endfor
-  
\ No newline at end of file
--- a/results/showvecs.m
+++ b/results/showvecs.m
@@ -1,5 +1,5 @@
-N = 21810;
-skip = 10;
+N = 40;
+skip = 1;
 
 for i = skip:skip:N
   nameu = "u"; namev = "v";
--- a/src/main-sw-rk4.cpp
+++ b/src/main-sw-rk4.cpp
@@ -19,7 +19,7 @@
 
 using namespace kwantix;
 
-#define RBF_TYPE kwantix::conical
+#define RBF_TYPE kwantix::multiquadric
 
 //Will solve the system
 //
@@ -168,7 +168,8 @@
       cout << "Now on iteration #" << i << endl;
       plotter.update_values(h0.at());
       plotter.plot();
-      if(i % 10 == 0){
+      if(true)//i % 1 == 0)
+      {
         save_interp(Omega,u0,i,"u");
         save_interp(Omega,v0,i,"v");
         save_interp(Omega,h0,i,"h");
--- a/src/vtkplot.cpp
+++ b/src/vtkplot.cpp
@@ -74,7 +74,18 @@
 }
 
 //Instantiations
-template vtkplot::vtkplot(const interpolator<conical>&, double, double, bool);
+template vtkplot::vtkplot(const interpolator<conical>&, 
+                          double, double, bool);
+template vtkplot::vtkplot(const interpolator<thin_plate_spline>&, 
+                          double, double, bool);
+template vtkplot::vtkplot(const interpolator<multiquadric>&, 
+                          double, double, bool);
+template vtkplot::vtkplot(const interpolator<inverse_multiquadric>&, 
+                          double, double, bool);
+template vtkplot::vtkplot(const interpolator<inverse_quadratic>&, 
+                          double, double, bool);
+template vtkplot::vtkplot(const interpolator<gaussian>&, 
+                          double, double, bool);
 
 void vtkplot::set_offscreen(bool offscreen_in)
 {
@@ -193,9 +204,6 @@
  
 }
 
-//Instantiations
-template void vtkplot::SetupPipeline(const interpolator<conical>&);
-
 void vtkplot::plot() const
 {
   if(offscreen)