Fixed Katy's comments on PR

1. Removed symmetry_correction flag, making the symmetry factor calculation automatic. 2. Moved application of symmetry factor in AMRReductions::norm function into the logic block controlled by the a_normalize_by_volume flag, so that only when normalising by the volume will the symmetry factor be applied. 3. Changed get_symm() function names to get_symmetry_factor() (coding convention). 4. Removed file path in params_very_cheap.txt in BinarBH example.
GRTLCollaboration · Oct 14, 2024 · 634240c · 634240c
1 parent 0bee0fa
commit 634240c
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 48 deletions.
diff --git a/Examples/BinaryBH/params.txt b/Examples/BinaryBH/params.txt
@@ -108,11 +108,6 @@ vars_parity            = 0 0 4 6 0 5 0    #chi and hij
 vars_parity_diagnostic = 0 1 2 3          #Ham and Mom
                          0 7              #Weyl
 
-# Additionally, if reflective boundaries selected, 
-# choose if symmetry factor will be applied to integrals.
-# 0 = false (default), 1 = true
-symmetry_correction = 1
-
 # if sommerfeld boundaries selected, must select
 # asymptotic values
 num_nonzero_asymptotic_vars = 5

diff --git a/Examples/BinaryBH/params_two_punctures.txt b/Examples/BinaryBH/params_two_punctures.txt
@@ -108,11 +108,6 @@ vars_parity            = 0 0 4 6 0 5 0    #chi and hij
 vars_parity_diagnostic = 0 1 2 3          #Ham and Mom
                          0 7              #Weyl
 
-# Additionally, if reflective boundaries selected, 
-# choose if symmetry factor will be applied to integrals.
-# 0 = false (default), 1 = true
-symmetry_correction = 1
-
 # if sommerfeld boundaries selected, must select
 # asymptotic values
 num_nonzero_asymptotic_vars = 5

diff --git a/Examples/BinaryBH/params_very_cheap.txt b/Examples/BinaryBH/params_very_cheap.txt
@@ -9,7 +9,7 @@
 verbosity = 0
 
 # location / naming of output files
-output_path = "/nfs/st01/hpc-gr-epss/eaf49/PR-dump" # Main path for all files. Must exist!
+# output_path = "" # Main path for all files. Must exist!
 chk_prefix = BinaryBHChk_
 plot_prefix = BinaryBHPlot_
 # restart_file = BinaryBHChk_000360.3d.hdf5
@@ -108,11 +108,6 @@ vars_parity            = 0 0 4 6 0 5 0    #chi and hij
 vars_parity_diagnostic = 0 1 2 3          #Ham and Mom
                          0 7              #Weyl
 
-# Additionally, if reflective boundaries selected, 
-# choose if symmetry factor will be applied to integrals.
-# 0 = false (default), 1 = true
-symmetry_correction = 1
-
 # if sommerfeld boundaries selected, must select
 # non zero asymptotic values
 num_nonzero_asymptotic_vars = 5

diff --git a/Examples/KerrBH/params.txt b/Examples/KerrBH/params.txt
@@ -96,11 +96,6 @@ vars_parity            = 0 0 4 6 0 5 0    #chi and hij
                          0 1 2 3 1 2 3    #lapse shift and B
 vars_parity_diagnostic = 0 1 2 3          #Ham and Mom
 
-# Additionally, if reflective boundaries selected, 
-# choose if symmetry factor will be applied to integrals.
-# 0 = false (default), 1 = true
-symmetry_correction = 1
-
 # if sommerfeld boundaries selected, must select
 # non zero asymptotic values
 num_nonzero_asymptotic_vars = 5

diff --git a/Examples/KerrBH/params_cheap.txt b/Examples/KerrBH/params_cheap.txt
@@ -97,11 +97,6 @@ vars_parity            = 0 0 4 6 0 5 0    #chi and hij
                          0 1 2 3 1 2 3    #lapse shift and B
 vars_parity_diagnostic = 0 1 2 3          #Ham and Mom
 
-# Additionally, if reflective boundaries selected, 
-# choose if symmetry factor will be applied to integrals.
-# 0 = false (default), 1 = true
-symmetry_correction = 1
-
 # if sommerfeld boundaries selected, must select
 # non zero asymptotic values
 num_nonzero_asymptotic_vars = 5

diff --git a/Examples/ScalarField/params.txt b/Examples/ScalarField/params.txt
@@ -114,11 +114,6 @@ vars_parity            = 0 0 4 6 0 5 0    #chi and hij
                          0 0              #phi and Pi
 vars_parity_diagnostic = 0 1 2 3          #Ham and Mom
 
-# Additionally, if reflective boundaries selected, 
-# choose if symmetry factor will be applied to integrals.
-# 0 = false (default), 1 = true
-symmetry_correction = 1
-
 # if sommerfeld boundaries selected, must select
 # non zero asymptotic values
 num_nonzero_asymptotic_vars = 5

diff --git a/Source/BoxUtils/AMRReductions.impl.hpp b/Source/BoxUtils/AMRReductions.impl.hpp
@@ -15,7 +15,7 @@ AMRReductions<var_t>::AMRReductions(const GRAMR &a_gramr,
                                     const int a_base_level)
     : m_base_level(a_base_level),
       m_coarsest_dx(a_gramr.get_gramrlevels()[0]->get_dx()),
-      m_symmetry_factor(a_gramr.get_gramrlevels()[0]->get_symm())
+      m_symmetry_factor(a_gramr.get_gramrlevels()[0]->get_symmetry_factor())
 {
     set_level_data_vect(a_gramr);
     set_ref_ratios_vect(a_gramr);
@@ -108,9 +108,10 @@ Real AMRReductions<var_t>::norm(const Interval &a_vars,
     {
         norm /=
             pow(m_domain_volume, 1.0 / static_cast<double>(a_norm_exponent));
+        norm *= static_cast<double>(m_symmetry_factor);
     }
 
-    return norm * static_cast<double>(m_symmetry_factor);
+    return norm;
 }
 
 template <VariableType var_t>

diff --git a/Source/GRChomboCore/BoundaryConditions.cpp b/Source/GRChomboCore/BoundaryConditions.cpp
@@ -142,20 +142,15 @@ void BoundaryConditions::params_t::read_params(GRParmParse &pp)
 
     if (reflective_boundaries_exist)
     {
-        int symmetry_correction = 0;
-        pp.load("symmetry_correction", symmetry_correction, 0);
-        if (symmetry_correction != 0)
+        for (int d = 0; d < CH_SPACEDIM; d++)
         {
-            for (int d = 0; d < CH_SPACEDIM; d++)
+            if (lo_boundary[d] == 2)
             {
-                if (lo_boundary[d] == 2)
-                {
-                    symmetry_factor *= 2;
-                }
-                else if (hi_boundary[d] == 2)
-                {
-                    symmetry_factor *= 2;
-                }
+                symmetry_factor *= 2;
+            }
+            else if (hi_boundary[d] == 2)
+            {
+                symmetry_factor *= 2;
             }
         }
 

diff --git a/Source/GRChomboCore/BoundaryConditions.hpp b/Source/GRChomboCore/BoundaryConditions.hpp
@@ -104,7 +104,7 @@ class BoundaryConditions
     /// Default constructor - need to call define afterwards
     BoundaryConditions() { is_defined = false; }
 
-    int get_symm() const { return m_symmetry_factor; }
+    int get_symmetry_factor() const { return m_symmetry_factor; }
 
     /// define function sets members and is_defined set to true
     void define(double a_dx, std::array<double, CH_SPACEDIM> a_center,

diff --git a/Source/GRChomboCore/GRAMRLevel.hpp b/Source/GRChomboCore/GRAMRLevel.hpp
@@ -177,9 +177,9 @@ class GRAMRLevel : public AMRLevel, public InterpSource<>
 
     // direction irrelevant, but relevant for InterpSource
     ALWAYS_INLINE double get_dx(int dir = 0) const { return m_dx; };
-    ALWAYS_INLINE int get_symm(int dir = 0) const
+    ALWAYS_INLINE int get_symmetry_factor(int dir = 0) const
     {
-        return m_boundaries.get_symm();
+        return m_boundaries.get_symmetry_factor();
     }
 
     /// Returns true if m_time is the same as the time at the end of the current