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

fixed flux - fluxnew Bug

parent 0fc22f3d
...@@ -479,7 +479,6 @@ void CSDSolverTrafoFPSH2D::IterPostprocessing( unsigned idx_pseudotime ) { ...@@ -479,7 +479,6 @@ void CSDSolverTrafoFPSH2D::IterPostprocessing( unsigned idx_pseudotime ) {
_dose[j] += _dE * _fluxNew[j] * _s[_nEnergies - n - 1] / _density[j]; _dose[j] += _dE * _fluxNew[j] * _s[_nEnergies - n - 1] / _density[j];
} }
_solverOutput[j] = _fluxNew[j]; _solverOutput[j] = _fluxNew[j];
_flux[j] = _fluxNew[j];
} }
} }
......
...@@ -230,10 +230,7 @@ void SolverBase::WriteScalarOutput( unsigned iteration ) { ...@@ -230,10 +230,7 @@ void SolverBase::WriteScalarOutput( unsigned iteration ) {
case ITER: _screenOutputFields[idx_field] = iteration; break; case ITER: _screenOutputFields[idx_field] = iteration; break;
case RMS_FLUX: case RMS_FLUX: _screenOutputFields[idx_field] = blaze::l2Norm( _fluxNew - _flux ); break;
_screenOutputFields[idx_field] = blaze::l2Norm( _fluxNew - _flux );
_flux = _fluxNew;
break;
case VTK_OUTPUT: case VTK_OUTPUT:
_screenOutputFields[idx_field] = 0; _screenOutputFields[idx_field] = 0;
...@@ -284,7 +281,6 @@ void SolverBase::WriteScalarOutput( unsigned iteration ) { ...@@ -284,7 +281,6 @@ void SolverBase::WriteScalarOutput( unsigned iteration ) {
case RMS_FLUX: case RMS_FLUX:
if( screenOutputFields.end() == itScreenOutput ) { if( screenOutputFields.end() == itScreenOutput ) {
_screenOutputFields[idx_field] = blaze::l2Norm( _fluxNew - _flux ); _screenOutputFields[idx_field] = blaze::l2Norm( _fluxNew - _flux );
_flux = _fluxNew;
} }
else { else {
_historyOutputFields[idx_field] = *itScreenOutput; _historyOutputFields[idx_field] = *itScreenOutput;
...@@ -310,6 +306,7 @@ void SolverBase::WriteScalarOutput( unsigned iteration ) { ...@@ -310,6 +306,7 @@ void SolverBase::WriteScalarOutput( unsigned iteration ) {
default: ErrorMessages::Error( "History output group not defined!", CURRENT_FUNCTION ); break; default: ErrorMessages::Error( "History output group not defined!", CURRENT_FUNCTION ); break;
} }
} }
_flux = _fluxNew;
} }
void SolverBase::PrintScreenOutput( unsigned iteration ) { void SolverBase::PrintScreenOutput( unsigned iteration ) {
......
Supports Markdown
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