Changeset 728149

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

Location:

src/interface

Files:

• interface_fcs.cpp (modified) (7 diffs)
• interface_fcs.h (modified) (1 diff)
• interface_particles_cf.cpp (modified) (4 diffs)

src/interface/interface_fcs.cpp

@@ -53 +53 @@
   static vmg_int max_iter = -1;
   static vmg_int smoothing_steps = -1;
-  static vmg_int gamma = -1;
+  static vmg_int cycle_type = -1;
   static vmg_float precision = -1;
   static vmg_float box_offset[3];
@@ -64 +64 @@
 
 static void VMG_fcs_init(vmg_int level, vmg_int* periodic,vmg_int max_iter,
-                         vmg_int smoothing_steps, vmg_int gamma, vmg_float precision,
+                         vmg_int smoothing_steps, vmg_int cycle_type, vmg_float precision,
                          vmg_float* box_offset, vmg_float box_size,
                          vmg_int near_field_cells, vmg_int interpolation_degree,
@@ -73 +73 @@
   VMGBackupSettings::max_iter = max_iter;
   VMGBackupSettings::smoothing_steps = smoothing_steps;
-  VMGBackupSettings::gamma = gamma;
+  VMGBackupSettings::cycle_type = cycle_type;
   VMGBackupSettings::precision = precision;
   std::memcpy(VMGBackupSettings::box_offset, box_offset, 3*sizeof(vmg_float));
@@ -158 +158 @@
    */
   if (singular)
-    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), gamma);
-  else
-    Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), gamma);
+    Techniques::SetCorrectionSchemePeriodic(interface->MinLevel(), interface->MaxLevel(), cycle_type);
+  else
+    Techniques::SetFullApproximationSchemeDirichlet(interface->MinLevel(), interface->MaxLevel(), cycle_type);
 
   /*
@@ -184 +184 @@
 
 void VMG_fcs_setup(vmg_int level, vmg_int* periodic, vmg_int max_iter,
-                   vmg_int smoothing_steps, vmg_int gamma, vmg_float precision,
+                   vmg_int smoothing_steps, vmg_int cycle_type, vmg_float precision,
                    vmg_float* box_offset, vmg_float box_size,
                    vmg_int near_field_cells, vmg_int interpolation_degree,
@@ -195 +195 @@
       VMGBackupSettings::max_iter != max_iter ||
       VMGBackupSettings::smoothing_steps != smoothing_steps ||
-      VMGBackupSettings::gamma != gamma ||
+      VMGBackupSettings::cycle_type != cycle_type ||
       VMGBackupSettings::precision != precision ||
       VMGBackupSettings::box_offset[0] != box_offset[0] ||
@@ -208 +208 @@
     VMG_fcs_destroy();
     VMG_fcs_init(level, periodic, max_iter,
-                 smoothing_steps, gamma, precision,
+                 smoothing_steps, cycle_type, precision,
                  box_offset, box_size, near_field_cells,
                  interpolation_degree, discretization_order,

src/interface/interface_fcs.h

@@ -14 +14 @@
 
 void VMG_fcs_setup(fcs_int level, fcs_int* periodic, fcs_int max_iter,
-                   fcs_int smoothing_steps, fcs_int gamma, fcs_float precision,
+                   fcs_int smoothing_steps, fcs_int cycle_type, fcs_float precision,
                    fcs_float* box_offset, fcs_float box_size,
                    fcs_int near_field_cells, fcs_int interpolation_degree,

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);