Commit ddc93440 authored by Steffen Schotthöfer's avatar Steffen Schotthöfer
Browse files

added option MAX_ENERGY_CSD

parent 71a578d3
Pipeline #136482 failed with stage
in 16 minutes
Subproject commit 54f38c0a6154004efa2f8cad4737d127f6dcde59 Subproject commit e1eab3b76738638e7db7a5f2bd62e72c923c717a
...@@ -87,6 +87,10 @@ class Config ...@@ -87,6 +87,10 @@ class Config
std::string _oxygenFile; /*!< @brief Name of oxygen cross section file path */ std::string _oxygenFile; /*!< @brief Name of oxygen cross section file path */
std::string _stoppingPowerFile; /*!< @brief Name of stopping power 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 // Scattering Kernel
KERNEL_NAME _kernelName; /*!< @brief Scattering Kernel Name*/ KERNEL_NAME _kernelName; /*!< @brief Scattering Kernel Name*/
...@@ -280,6 +284,8 @@ class Config ...@@ -280,6 +284,8 @@ class Config
// Linesource // Linesource
double inline GetSigmaS() const { return _sigmaS; } double inline GetSigmaS() const { return _sigmaS; }
// CSD
double inline GetMaxEnergyCSD() const { return _maxEnergyCSD; }
// Optimizer // Optimizer
double inline GetNewtonOptimizerEpsilon() const { return _optimizerEpsilon; } double inline GetNewtonOptimizerEpsilon() const { return _optimizerEpsilon; }
unsigned long inline GetNewtonIter() const { return _newtonIter; } unsigned long inline GetNewtonIter() const { return _newtonIter; }
......
...@@ -32,7 +32,7 @@ MAX_MOMENT_SOLVER = 1 ...@@ -32,7 +32,7 @@ MAX_MOMENT_SOLVER = 1
% ---- Entropy settings ---- % ---- Entropy settings ----
% %
ENTROPY_FUNCTIONAL = MAXWELL_BOLTZMANN ENTROPY_FUNCTIONAL = MAXWELL_BOLTZMANN
ENTROPY_OPTIMIZER = ML ENTROPY_OPTIMIZER = NEWTON
NEURAL_MODEL = 7 NEURAL_MODEL = 7
% %
% ----- Newton Solver Specifications ---- % ----- Newton Solver Specifications ----
......
...@@ -14,7 +14,7 @@ OUTPUT_FILE = PN_checkerboard ...@@ -14,7 +14,7 @@ OUTPUT_FILE = PN_checkerboard
% Log directory % Log directory
LOG_DIR = ../result/logs LOG_DIR = ../result/logs
% Mesh File % Mesh File
MESH_FILE = checkerboard.su2 MESH_FILE = meshes/checkerboard.su2
% %
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
OUTPUT_DIR = ../result OUTPUT_DIR = ../result
OUTPUT_FILE = checkerboard OUTPUT_FILE = checkerboard
LOG_DIR = ../result/logs LOG_DIR = ../result/logs
MESH_FILE = checkerboard.su2 MESH_FILE = meshes/checkerboard.su2
% ---- Solver specifications ---- % ---- Solver specifications ----
CFL_NUMBER = 0.5 CFL_NUMBER = 0.5
......
...@@ -15,7 +15,7 @@ OUTPUT_FILE = exampleMN_mono ...@@ -15,7 +15,7 @@ OUTPUT_FILE = exampleMN_mono
LOG_DIR = ../result/logs LOG_DIR = ../result/logs
% Mesh File % Mesh File
MESH_FILE = meshes/linesource.su2 MESH_FILE = meshes/linesource.su2
%MESH_FILE = linesource_debug.su2 %MESH_FILE = meshes/linesource_debug.su2
% %
% ---- Problem description --- % ---- Problem description ---
% %
......
...@@ -261,6 +261,10 @@ void Config::SetConfigOptions() { ...@@ -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 */ /*! @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 ); 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 // Entropy related options
/*! @brief Entropy Functional \n DESCRIPTION: Entropy functional used for the MN_Solver \n DEFAULT QUADRTATIC @ingroup Config. */ /*! @brief Entropy Functional \n DESCRIPTION: Entropy functional used for the MN_Solver \n DEFAULT QUADRTATIC @ingroup Config. */
AddEnumOption( "ENTROPY_FUNCTIONAL", _entropyName, Entropy_Map, QUADRATIC ); AddEnumOption( "ENTROPY_FUNCTIONAL", _entropyName, Entropy_Map, QUADRATIC );
......
...@@ -18,7 +18,7 @@ CSDSNSolver::CSDSNSolver( Config* settings ) : SNSolver( settings ) { ...@@ -18,7 +18,7 @@ CSDSNSolver::CSDSNSolver( Config* settings ) : SNSolver( settings ) {
_angle = Vector( _settings->GetNQuadPoints(), 0.0 ); // my _angle = Vector( _settings->GetNQuadPoints(), 0.0 ); // my
_energies = Vector( _nEnergies, 0.0 ); // equidistant _energies = Vector( _nEnergies, 0.0 ); // equidistant
double energyMin = 1e-1; double energyMin = 1e-1;
double energyMax = 5e0; double energyMax = _settings->GetMaxEnergyCSD(); // 5e0;
// --- Write equidistant energy grid // --- Write equidistant energy grid
_dE = ComputeTimeStep( settings->GetCFL() ); _dE = ComputeTimeStep( settings->GetCFL() );
......
...@@ -20,7 +20,8 @@ CSDSNSolverFP::CSDSNSolverFP( Config* settings ) : SNSolver( settings ) { ...@@ -20,7 +20,8 @@ CSDSNSolverFP::CSDSNSolverFP( Config* settings ) : SNSolver( settings ) {
_energies = Vector( _nEnergies, 0.0 ); // equidistant _energies = Vector( _nEnergies, 0.0 ); // equidistant
_energyMin = 1e-4; _energyMin = 1e-4;
//_energyMax = 10.0; //_energyMax = 10.0;
_energyMax = 5.0; _energyMax = _settings->GetMaxEnergyCSD(); // 5e0;
// write equidistant energy grid // write equidistant energy grid
_dE = ComputeTimeStep( settings->GetCFL() ); _dE = ComputeTimeStep( settings->GetCFL() );
......
...@@ -17,7 +17,7 @@ CSDSNSolverNoTrafo::CSDSNSolverNoTrafo( Config* settings ) : SNSolver( settings ...@@ -17,7 +17,7 @@ CSDSNSolverNoTrafo::CSDSNSolverNoTrafo( Config* settings ) : SNSolver( settings
_angle = Vector( _settings->GetNQuadPoints(), 0.0 ); // my _angle = Vector( _settings->GetNQuadPoints(), 0.0 ); // my
_energies = Vector( _nEnergies, 0.0 ); // equidistant _energies = Vector( _nEnergies, 0.0 ); // equidistant
double energyMin = 1e-1; double energyMin = 1e-1;
double energyMax = 5e0; double energyMax = _settings->GetMaxEnergyCSD(); // 5e0;
// write equidistant energy grid // write equidistant energy grid
_dE = ComputeTimeStep( settings->GetCFL() ); _dE = ComputeTimeStep( settings->GetCFL() );
......
...@@ -18,7 +18,7 @@ CSDSolverTrafoFP2D::CSDSolverTrafoFP2D( Config* settings ) : SNSolver( settings ...@@ -18,7 +18,7 @@ CSDSolverTrafoFP2D::CSDSolverTrafoFP2D( Config* settings ) : SNSolver( settings
// Set angle and energies // Set angle and energies
_energies = Vector( _nEnergies, 0.0 ); // equidistant _energies = Vector( _nEnergies, 0.0 ); // equidistant
_energyMin = 1e-4 * 0.511; _energyMin = 1e-4 * 0.511;
_energyMax = 0.01; // 50e0; _energyMax = _settings->GetMaxEnergyCSD(); // 5e0;
// write equidistant energy grid (false) or refined grid (true) // write equidistant energy grid (false) or refined grid (true)
GenerateEnergyGrid( false ); GenerateEnergyGrid( false );
......
...@@ -7,7 +7,7 @@ CSDSolverTrafoFPSH2D::CSDSolverTrafoFPSH2D( Config* settings ) : SNSolver( setti ...@@ -7,7 +7,7 @@ CSDSolverTrafoFPSH2D::CSDSolverTrafoFPSH2D( Config* settings ) : SNSolver( setti
// Set angle and energies // Set angle and energies
_energies = Vector( _nEnergies, 0.0 ); // equidistant _energies = Vector( _nEnergies, 0.0 ); // equidistant
_energyMin = 1e-4 * 0.511; _energyMin = 1e-4 * 0.511;
_energyMax = 0.1; // 1.0; _energyMax = _settings->GetMaxEnergyCSD(); // 0.1;
// write equidistant energy grid (false) or refined grid (true) // write equidistant energy grid (false) or refined grid (true)
GenerateEnergyGrid( false ); GenerateEnergyGrid( false );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment