added option MAX_ENERGY_CSD

neuralEntropy @ e1eab3b7

-Subproject commit 54f38c0a6154004efa2f8cad4737d127f6dcde59
+Subproject commit e1eab3b76738638e7db7a5f2bd62e72c923c717a

code/include/common/config.h

@@ -87,6 +87,10 @@ class Config
     std::string _oxygenFile;        /*!< @brief Name of oxygen cross section file path */
     std::string _stoppingPowerFile; /*!< @brief Name of stopping power file path */
 
+    // CSD
+    double _maxEnergyCSD; /*!< @brief Maximum energy for CSD simulation */
+
+    // --- other variables ---
     // Scattering Kernel
     KERNEL_NAME _kernelName; /*!< @brief Scattering Kernel Name*/
 
@@ -280,6 +284,8 @@ class Config
     // Linesource
     double inline GetSigmaS() const { return _sigmaS; }
 
+    // CSD
+    double inline GetMaxEnergyCSD() const { return _maxEnergyCSD; }
     //  Optimizer
     double inline GetNewtonOptimizerEpsilon() const { return _optimizerEpsilon; }
     unsigned long inline GetNewtonIter() const { return _newtonIter; }

code/input/checkerboard_MN.cfg

@@ -32,7 +32,7 @@ MAX_MOMENT_SOLVER = 1
 % ---- Entropy settings ----
 %
 ENTROPY_FUNCTIONAL = MAXWELL_BOLTZMANN
-ENTROPY_OPTIMIZER = ML
+ENTROPY_OPTIMIZER = NEWTON
 NEURAL_MODEL = 7
 %
 % ----- Newton Solver Specifications ----

code/input/checkerboard_PN.cfg

@@ -14,7 +14,7 @@ OUTPUT_FILE = PN_checkerboard
 % Log directory
 LOG_DIR = ../result/logs
 % Mesh File
-MESH_FILE = checkerboard.su2
+MESH_FILE = meshes/checkerboard.su2
 
 
 %

code/input/checkerboard_SN.cfg

@@ -2,7 +2,7 @@
 OUTPUT_DIR = ../result
 OUTPUT_FILE = checkerboard
 LOG_DIR = ../result/logs
-MESH_FILE = checkerboard.su2
+MESH_FILE = meshes/checkerboard.su2
 
 % ---- Solver specifications ----
 CFL_NUMBER = 0.5

code/input/linesource_MN.cfg

@@ -15,7 +15,7 @@ OUTPUT_FILE = exampleMN_mono
 LOG_DIR = ../result/logs
 % Mesh File
 MESH_FILE = meshes/linesource.su2
-%MESH_FILE = linesource_debug.su2
+%MESH_FILE = meshes/linesource_debug.su2
 %
 % ---- Problem description ---
 %

code/src/common/config.cpp

@@ -261,6 +261,10 @@ void Config::SetConfigOptions() {
     /*! @brief SCATTER_COEFF \n DESCRIPTION: Sets the scattering coefficient for the Linesource test case. \n DEFAULT 0.0 \ingroup Config */
     AddDoubleOption( "SCATTER_COEFF", _sigmaS, 0.0 );
 
+    // CSD related options
+    /*! @brief: MAX_ENERGY_CSD \n DESCRIPTION: Sets maximum energy for the CSD simulation.\n DEFAULT \ingroup Config */
+    AddDoubleOption( "MAX_ENERGY_CSD", _maxEnergyCSD, 5.0 );
+
     // Entropy related options
     /*! @brief Entropy Functional \n DESCRIPTION: Entropy functional used for the MN_Solver \n DEFAULT QUADRTATIC @ingroup Config. */
     AddEnumOption( "ENTROPY_FUNCTIONAL", _entropyName, Entropy_Map, QUADRATIC );

code/src/solvers/csdsnsolver.cpp

@@ -18,7 +18,7 @@ CSDSNSolver::CSDSNSolver( Config* settings ) : SNSolver( settings ) {
     _angle           = Vector( _settings->GetNQuadPoints(), 0.0 );    // my
     _energies        = Vector( _nEnergies, 0.0 );                     // equidistant
     double energyMin = 1e-1;
-    double energyMax = 5e0;
+    double energyMax = _settings->GetMaxEnergyCSD();    // 5e0;
 
     // --- Write equidistant energy grid
     _dE        = ComputeTimeStep( settings->GetCFL() );

code/src/solvers/csdsnsolverfp.cpp

@@ -20,7 +20,8 @@ CSDSNSolverFP::CSDSNSolverFP( Config* settings ) : SNSolver( settings ) {
     _energies  = Vector( _nEnergies, 0.0 );                     // equidistant
     _energyMin = 1e-4;
     //_energyMax = 10.0;
-    _energyMax = 5.0;
+    _energyMax = _settings->GetMaxEnergyCSD();    // 5e0;
+
     // write equidistant energy grid
 
     _dE        = ComputeTimeStep( settings->GetCFL() );

code/src/solvers/csdsnsolvernotrafo.cpp

@@ -17,7 +17,7 @@ CSDSNSolverNoTrafo::CSDSNSolverNoTrafo( Config* settings ) : SNSolver( settings
     _angle           = Vector( _settings->GetNQuadPoints(), 0.0 );    // my
     _energies        = Vector( _nEnergies, 0.0 );                     // equidistant
     double energyMin = 1e-1;
-    double energyMax = 5e0;
+    double energyMax = _settings->GetMaxEnergyCSD();    // 5e0;
     // write equidistant energy grid
 
     _dE        = ComputeTimeStep( settings->GetCFL() );

code/src/solvers/csdsolvertrafofp2d.cpp

@@ -18,7 +18,7 @@ CSDSolverTrafoFP2D::CSDSolverTrafoFP2D( Config* settings ) : SNSolver( settings
     // Set angle and energies
     _energies  = Vector( _nEnergies, 0.0 );    // equidistant
     _energyMin = 1e-4 * 0.511;
-    _energyMax = 0.01;    // 50e0;
+    _energyMax = _settings->GetMaxEnergyCSD();    // 5e0;
 
     // write equidistant energy grid (false) or refined grid (true)
     GenerateEnergyGrid( false );

code/src/solvers/csdsolvertrafofpsh2d.cpp

@@ -7,7 +7,7 @@ CSDSolverTrafoFPSH2D::CSDSolverTrafoFPSH2D( Config* settings ) : SNSolver( setti
     // Set angle and energies
     _energies  = Vector( _nEnergies, 0.0 );    // equidistant
     _energyMin = 1e-4 * 0.511;
-    _energyMax = 0.1;    // 1.0;
+    _energyMax = _settings->GetMaxEnergyCSD();    // 0.1;
 
     // write equidistant energy grid (false) or refined grid (true)
     GenerateEnergyGrid( false );