Changeset 14d38c for src

Timestamp:

Apr 13, 2013, 4:28:08 PM (13 years ago)

Author:

Julian Iseringhausen <isering@…>

Children:

13b272

Parents:

1e45786

Message:

Renamed folder samples to discretization and worked on inner boundaries for open boundary conditions.

Location:

src

Files:

• Makefile.am (modified) (2 diffs)
• discretization/discretization_poisson_fd.cpp (moved) (moved from src/samples/discretization_poisson_fd.cpp ) (1 diff)
• discretization/discretization_poisson_fd.hpp (moved) (moved from src/samples/discretization_poisson_fd.hpp )
• discretization/discretization_poisson_fv.cpp (added)
• discretization/discretization_poisson_fv.hpp (moved) (moved from src/samples/discretization_poisson_fv.hpp )
• grid/grid_index_translations.cpp (modified) (1 diff)
• samples/discretization_poisson_fv.cpp (deleted)
• units/particle/interface_fcs.cpp (modified) (1 diff)

src/Makefile.am

@@ -110 +110 @@
         cycles/cycle_fas_periodic_debug.cpp \
         cycles/cycle_fas_periodic_debug.hpp \
+        discretization/discretization_poisson_fd.cpp \
+        discretization/discretization_poisson_fd.hpp \
+        discretization/discretization_poisson_fv.cpp \
+        discretization/discretization_poisson_fv.hpp \
         grid/global_grid_partitioning.cpp \
         grid/global_grid_partitioning.hpp \
@@ -133 +137 @@
         level/level_operator.hpp \
         level/stencils.hpp \
-        samples/discretization_poisson_fd.cpp \
-        samples/discretization_poisson_fd.hpp \
-        samples/discretization_poisson_fv.cpp \
-        samples/discretization_poisson_fv.hpp \
         smoother/gs.cpp \
         smoother/gs.hpp \

src/discretization/discretization_poisson_fd.cpp

@@ -33 +33 @@
 #endif
 
+#include "discretization/discretization_poisson_fd.hpp"
 #include "grid/grid.hpp"
-#include "samples/discretization_poisson_fd.hpp"
 #include "mg.hpp"
 

src/grid/grid_index_translations.cpp

@@ -156 +156 @@
 
 void GridIndexTranslations::GetInnerBoundary(const Grid& grid_c, Index& b1_c, Index& b2_c,
-                                             const Grid& grid_f,   Index& b1_f, Index& b2_f)
+                                             const Grid& grid_f, Index& b1_f, Index& b2_f)
 {
   if (grid_f.Global().BoundaryType() == LocallyRefined) {
 
+    const Boundary& bc = MG::GetComm()->BoundaryConditions();
+
     const int global_mult = Helper::intpow(2, MG::GetSol()->MaxLevel() - grid_c.Level());
+
+    for (int i=0; i<3; ++i) {
+      if (bc[i] == Open) {
+        int begin_f_global = grid_f.Global().LocalBegin()[i] + (grid_f.Global().LocalBegin()[i] % 2 == 0 ? 0 : 1);
+        int end_f_global = grid_f.Global().LocalEnd()[i] + (grid_f.Global().LocalEnd()[i] % 2 == 0 ? 1 : 0);
+      } else {
+
+      }
+    }
 
     Index begin_finest = GlobalToGlobalFinest(grid_c, grid_c.Global().LocalBegin())

src/units/particle/interface_fcs.cpp

@@ -48 +48 @@
 #include "cycles/cycle_cs_periodic.hpp"
 #include "cycles/cycle_fas_dirichlet.hpp"
+#include "discretization/discretization_poisson_fd.hpp"
+#include "discretization/discretization_poisson_fv.hpp"
 #include "level/level_operator_cs.hpp"
 #include "level/level_operator_fas.hpp"
 #include "level/stencils.hpp"
-#include "samples/discretization_poisson_fd.hpp"
-#include "samples/discretization_poisson_fv.hpp"
 #include "smoother/gsrb_poisson_2.hpp"
 #include "smoother/gsrb_poisson_4.hpp"