Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Balance for HT process #2132

Merged
merged 13 commits into from
May 31, 2018
Merged

Balance for HT process #2132

Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
81d275e
[PL] HT: Implement HTProcess::getFlux().
TomFischer May 7, 2018
d8b55d5
[PL] Clang format parts of HTProcess.
TomFischer May 8, 2018
744ddd4
[PL] Clang format parts of HTLocalAssemblerInterface.
TomFischer May 8, 2018
38413ee
[PL] Implement getFlux() in HT process local asm.
TomFischer May 8, 2018
7546ae2
[PL/HT] Enable reading information for the balance.
TomFischer May 8, 2018
f608621
[PL/HT] Enable the balance calculation in HT.
TomFischer May 9, 2018
2689f06
[PL] Add t and dt to postTimestep{ConcreteProcess}.
TomFischer May 14, 2018
1d9aa9a
[PL] Include time in balance output file name.
TomFischer May 14, 2018
0be9c2b
[PL/HT] Add tests for the balance/flux calculation.
TomFischer May 25, 2018
75fa95f
[PL] Early exit if calc. of balance isn't needed.
TomFischer May 30, 2018
fdeafde
[PL/CalculateSurfaceFlux] Correct comment.
TomFischer May 30, 2018
3f11cb8
[PL] Change return type of getFlux().
TomFischer May 30, 2018
dd8c5ca
[PL] Time dependency for the flux calculation.
TomFischer May 30, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[PL] Include time in balance output file name.
  • Loading branch information
@TomFischer
TomFischer committed May 30, 2018
commit 1d9aa9a14949880b76736b22c7c41fcb0e53ba26
19 changes: 9 additions & 10 deletions ProcessLib/HT/HTProcess.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,25 +273,24 @@ void HTProcess::postTimestepConcreteProcess(GlobalVector const& x,
}
if (_balance_mesh) // computing the balance is optional
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more. 

if (!_balance_mesh)
{
    return;
}

{
std::vector<double> init_values(_balance_mesh->getNumberOfElements(),
0.0);
MeshLib::addPropertyToMesh(*_balance_mesh, _balance_pv_name,
MeshLib::MeshItemType::Cell, 1, init_values);
auto* const balance_pv = MeshLib::getOrCreateMeshProperty<double>(
*_balance_mesh, _balance_pv_name, MeshLib::MeshItemType::Cell, 1);
// initialise the PropertyVector pv with zero values
std::fill(balance_pv->begin(), balance_pv->end(), 0.0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure here;
If the properties are set, then use NaN for initialization. If the properties are '+='-ed, then setting them 0 is of course necessary.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The properties are '+='-ed.

auto balance = ProcessLib::CalculateSurfaceFlux(
*_balance_mesh,
getProcessVariables(process_id)[0].get().getNumberOfComponents(),
_integration_order);

auto* const balance_pv =
_balance_mesh->getProperties().template getPropertyVector<double>(
_balance_pv_name);

balance.integrate(x, *balance_pv, *this);
// post: surface_mesh has vectorial element property
// post: surface_mesh has scalar element property

// TODO output, if output classes are ready this has to be
// changed
MeshLib::IO::writeMeshToFile(*_balance_mesh, _balance_out_fname);
std::string const fname =
BaseLib::dropFileExtension(_balance_out_fname) + "_t_" +
std::to_string(t) + ".vtu";
MeshLib::IO::writeMeshToFile(*_balance_mesh, fname);
}
}

Expand Down