Changeset a150d0

Timestamp:

Apr 25, 2012, 4:21:08 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

7dd744

Parents:

b51c3b

Message:

vmg: Added parameter to control the interpolation degree (Tensor Lagrange interpolation) for interpolating the potentials from the grid to the particle positions.

git-svn-id: ​https://svn.version.fz-juelich.de/scafacos/trunk@1742 5161e1c8-67bf-11de-9fd5-51895aff932f

Location:

src/interface

Files:

• interface_fcs.cpp (modified) (7 diffs)
• interface_fcs.h (modified) (1 diff)
• interface_particles.cpp (modified) (2 diffs)

src/interface/interface_fcs.cpp

@@ -58 +58 @@
   static vmg_float box_size = -1.0;
   static vmg_int near_field_cells = -1;
+  static vmg_int interpolation_degree = -1;
   static MPI_Comm mpi_comm;
 }
@@ -64 +65 @@
                          vmg_int smoothing_steps, vmg_int gamma, vmg_float precision,
                          vmg_float* box_offset, vmg_float box_size,
-                         vmg_int near_field_cells, MPI_Comm mpi_comm)
+                         vmg_int near_field_cells, vmg_int interpolation_degree,
+                         MPI_Comm mpi_comm)
 {
   VMGBackupSettings::level = level;
@@ -75 +77 @@
   VMGBackupSettings::box_size = box_size;
   VMGBackupSettings::near_field_cells = near_field_cells;
+  VMGBackupSettings::interpolation_degree = interpolation_degree;
   VMGBackupSettings::mpi_comm = mpi_comm;
 
@@ -163 +166 @@
   new ObjectStorage<int>("MAX_ITERATION", max_iter);
   new ObjectStorage<int>("PARTICLE_NEAR_FIELD_CELLS", near_field_cells);
+  new ObjectStorage<int>("PARTICLE_INTERPOLATION_DEGREE", interpolation_degree);
 
   /*
@@ -178 +182 @@
                    vmg_int smoothing_steps, vmg_int gamma, vmg_float precision,
                    vmg_float* box_offset, vmg_float box_size,
-                   vmg_int near_field_cells, MPI_Comm mpi_comm)
+                   vmg_int near_field_cells, vmg_int interpolation_degree,
+                   MPI_Comm mpi_comm)
 {
   if (VMGBackupSettings::level != level ||
@@ -193 +198 @@
       VMGBackupSettings::box_size != box_size ||
       VMGBackupSettings::near_field_cells != near_field_cells ||
+      VMGBackupSettings::interpolation_degree != interpolation_degree ||
       VMGBackupSettings::mpi_comm != mpi_comm) {
 
@@ -199 +205 @@
                  smoothing_steps, gamma, precision,
                  box_offset, box_size, near_field_cells,
-                 mpi_comm);
+                 interpolation_degree, mpi_comm);
 
   }

src/interface/interface_fcs.h

@@ -16 +16 @@
                    fcs_int smoothing_steps, fcs_int gamma, fcs_float precision,
                    fcs_float* box_offset, fcs_float box_size,
-                   fcs_int near_field_cells, MPI_Comm mpi_comm);
+                   fcs_int near_field_cells, fcs_int interpolation_degree,
+                   MPI_Comm mpi_comm);
 
 int VMG_fcs_check();

src/interface/interface_particles.cpp

@@ -102 +102 @@
   vmg_float length;
   Vector dist_vec;
-  InterpolatePolynomial ip(8);
 
 #ifdef DEBUG_OUTPUT
@@ -119 +118 @@
    */
   const vmg_int& num_particles_local = factory.GetObjectStorageVal<vmg_int>("PARTICLE_NUM_LOCAL");
-  const int& near_field_cells = factory.GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
+  const vmg_int& near_field_cells = factory.GetObjectStorageVal<int>("PARTICLE_NEAR_FIELD_CELLS");
+  const vmg_int& interpolation_degree = factory.GetObjectStorageVal<int>("PARTICLE_INTERPOLATION_DEGREE");
   vmg_float* p = factory.GetObjectStorageArray<vmg_float>("PARTICLE_POTENTIAL_ARRAY");
   vmg_float* f = factory.GetObjectStorageArray<vmg_float>("PARTICLE_FIELD_ARRAY");
+
+  InterpolatePolynomial ip(interpolation_degree);
 
   const vmg_float r_cut = (near_field_cells+0.5) * grid.Extent().MeshWidth().Max();