Commit 7e69d815 authored by Praetorius, Simon's avatar Praetorius, Simon

Merge branch 'issue/remove_warning_problemstat' into 'master'

remove 'xyz is already created' warning in ProblemStat::initialize

See merge request !211
parents 77862e92 be59860f
Pipeline #4933 passed with stage
in 68 minutes and 37 seconds
...@@ -26,10 +26,7 @@ void ProblemStat<Traits>::initialize( ...@@ -26,10 +26,7 @@ void ProblemStat<Traits>::initialize(
Flag adoptFlag) Flag adoptFlag)
{ {
// create grids // create grids
if (grid_) { if (!grid_) {
warning("grid already created");
}
else {
if (initFlag.isSet(CREATE_MESH) || if (initFlag.isSet(CREATE_MESH) ||
(!adoptFlag.isSet(INIT_MESH) && (!adoptFlag.isSet(INIT_MESH) &&
(initFlag.isSet(INIT_SYSTEM) || initFlag.isSet(INIT_FE_SPACE)))) { (initFlag.isSet(INIT_SYSTEM) || initFlag.isSet(INIT_FE_SPACE)))) {
...@@ -48,10 +45,7 @@ void ProblemStat<Traits>::initialize( ...@@ -48,10 +45,7 @@ void ProblemStat<Traits>::initialize(
warning("no grid created"); warning("no grid created");
// create fespace // create fespace
if (globalBasis_) { if (!globalBasis_) {
warning("globalBasis already created");
}
else {
if (initFlag.isSet(INIT_FE_SPACE) || if (initFlag.isSet(INIT_FE_SPACE) ||
(initFlag.isSet(INIT_SYSTEM) && !adoptFlag.isSet(INIT_FE_SPACE))) { (initFlag.isSet(INIT_SYSTEM) && !adoptFlag.isSet(INIT_FE_SPACE))) {
createGlobalBasis(); createGlobalBasis();
...@@ -79,10 +73,7 @@ void ProblemStat<Traits>::initialize( ...@@ -79,10 +73,7 @@ void ProblemStat<Traits>::initialize(
// create solver // create solver
if (linearSolver_) { if (!linearSolver_) {
warning("solver already created\n");
}
else {
if (initFlag.isSet(INIT_SOLVER)) if (initFlag.isSet(INIT_SOLVER))
createSolver(); createSolver();
...@@ -139,9 +130,7 @@ restore(Flag initFlag) ...@@ -139,9 +130,7 @@ restore(Flag initFlag)
createMatricesAndVectors(); createMatricesAndVectors();
// create solver // create solver
if (linearSolver_) if (!linearSolver_ && initFlag.isSet(INIT_SOLVER))
warning("solver already created\n");
else if (initFlag.isSet(INIT_SOLVER))
createSolver(); createSolver();
// create marker // create marker
......
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