Changeset 728149 for src/interface/interface_particles_cf.cpp

Timestamp:

Apr 30, 2012, 2:40:31 PM (14 years ago)

Author:

Frederik Heber <heber@…>

Children:

759a6a

Parents:

d448a7

Message:

Conformalized vmg getter functions with other solvers.

• also rename gamma -> cycle_type.
• all getters now return FCSResult and require two parameters.

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

File:

• src/interface/interface_particles_cf.cpp (modified) (4 diffs)

src/interface/interface_particles_cf.cpp

@@ -59 +59 @@
   int max_level, max_iterations;
   int pre_smoothing_steps, post_smoothing_steps;
-  int gamma, near_field_cells, discretization_order;
+  int cycle_type, near_field_cells, discretization_order;
   vmg_float precision;
   std::string lop_str, datafile_str;
@@ -107 +107 @@
   pre_smoothing_steps = Helper::ToValWithDefault<int>(xml_conf.child_value("pre_smoothing_steps"), 3);
   post_smoothing_steps = Helper::ToValWithDefault<int>(xml_conf.child_value("post_smoothing_steps"), 3);
-  gamma = Helper::ToValWithDefault<int>(xml_conf.child_value("gamma"), 1);
+  cycle_type = Helper::ToValWithDefault<int>(xml_conf.child_value("cycle_type"), 1);
   near_field_cells = Helper::ToValWithDefault<int>(xml_conf.child_value("near_field_cells"), 3);
   discretization_order = Helper::ToValWithDefault<int>(xml_conf.child_value("discretization_order"), 2);
@@ -133 +133 @@
   if (!lop_str.compare("cs")) {
     lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
-    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), cycle_type);
   } else if (!lop_str.compare("fas")) {
     lop = new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
-    Techniques::SetFullApproximationSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetFullApproximationSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), cycle_type);
   } else if (!lop_str.compare("cs_debug")) {
     lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
-    Techniques::SetCorrectionSchemePeriodicDebug(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetCorrectionSchemePeriodicDebug(interface->MinLevel(), interface->MaxLevel(), cycle_type);
   } else if (!lop_str.compare("fas_debug")) {
     lop = new LevelOperatorFAS(Stencils::RestrictionFullWeight, Stencils::Injection, Stencils::InterpolationTrilinear);
-    Techniques::SetFullApproximationSchemePeriodicDebug(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetFullApproximationSchemePeriodicDebug(interface->MinLevel(), interface->MaxLevel(), cycle_type);
   } else {
     lop = new LevelOperatorCS(Stencils::RestrictionFullWeight, Stencils::InterpolationTrilinear);
-    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), cycle_type);
   }
   lop->Register("LEVEL_OPERATOR");
@@ -170 +170 @@
     std::printf("  Maximum level:                %d\n", max_level);
     std::printf("  Maximum number of iterations: %d\n", max_iterations);
-    std::printf("  Gamma:                        %d\n", gamma);
+    std::printf("  Gamma:                        %d\n", cycle_type);
     std::printf("  Pre smoothing steps:          %d\n", pre_smoothing_steps);
     std::printf("  Post smoothing steps:         %d\n", post_smoothing_steps);