Changeset 4571da for src/interface/interface_fcs.cpp

Timestamp:

Apr 27, 2012, 11:34:57 PM (14 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

1a92cf

Parents:

b2154a3

Message:

vmg: Implement fourth-order discretization of the Poisson equation.

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

File:

• src/interface/interface_fcs.cpp (modified) (9 diffs)

src/interface/interface_fcs.cpp

@@ -35 +35 @@
 #include "samples/stencils.hpp"
 #include "samples/techniques.hpp"
-#include "smoother/gsrb.cpp"
+#include "smoother/gsrb.hpp"
 #ifdef HAVE_LAPACK
 #include "solver/dgesv.hpp"
@@ -59 +59 @@
   static vmg_int near_field_cells = -1;
   static vmg_int interpolation_degree = -1;
+  static vmg_int discretization_order = -1;
   static MPI_Comm mpi_comm;
 }
@@ -66 +67 @@
                          vmg_float* box_offset, vmg_float box_size,
                          vmg_int near_field_cells, vmg_int interpolation_degree,
-                         MPI_Comm mpi_comm)
+                         vmg_int discretization_order, MPI_Comm mpi_comm)
 {
   VMGBackupSettings::level = level;
@@ -78 +79 @@
   VMGBackupSettings::near_field_cells = near_field_cells;
   VMGBackupSettings::interpolation_degree = interpolation_degree;
+  VMGBackupSettings::discretization_order = discretization_order;
   VMGBackupSettings::mpi_comm = mpi_comm;
 
@@ -113 +115 @@
   Discretization* discretization;
   if (singular)
-    discretization = new DiscretizationPoissonFD();
-  else
-    discretization = new DiscretizationPoissonFV();
+    discretization = new DiscretizationPoissonFD(discretization_order);
+  else
+    discretization = new DiscretizationPoissonFV(discretization_order);
   discretization->Register("DISCRETIZATION");
 
@@ -154 +156 @@
    */
   if (singular)
-    Techniques::SetCorrectionSchemePeriodicParticle(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), gamma);
   else
     Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), gamma);
@@ -183 +185 @@
                    vmg_float* box_offset, vmg_float box_size,
                    vmg_int near_field_cells, vmg_int interpolation_degree,
-                   MPI_Comm mpi_comm)
+                   vmg_int discretization_order, MPI_Comm mpi_comm)
 {
   if (VMGBackupSettings::level != level ||
@@ -199 +201 @@
       VMGBackupSettings::near_field_cells != near_field_cells ||
       VMGBackupSettings::interpolation_degree != interpolation_degree ||
+      VMGBackupSettings::discretization_order != discretization_order ||
       VMGBackupSettings::mpi_comm != mpi_comm) {
 
@@ -205 +208 @@
                  smoothing_steps, gamma, precision,
                  box_offset, box_size, near_field_cells,
-                 interpolation_degree, mpi_comm);
+                 interpolation_degree, discretization_order,
+                 mpi_comm);
 
   }