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

Jump to bottom

Material properties for adsorption #1178

Merged
merged 34 commits into from May 25, 2016
Merged

Material properties for adsorption #1178

merged 34 commits into from May 25, 2016

Conversation

chleh
Copy link
Collaborator

@chleh chleh commented Apr 29, 2016 •
edited

Adsorption equilibrium, linear driving force kinetics and adsorption enthalpy equations.

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Mac-PRs/1630/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1745/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Gui/Gui-Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Gui-Linux-PRs/1714/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Linux-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs/1746/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1600/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Mac-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Mac-PRs/1631/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1622/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1623/

@ogsbot
Copy link
Member

ogsbot commented Apr 29, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1601/

@ogsbot
Copy link
Member

ogsbot commented Apr 30, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1625/

@ogsbot
Copy link
Member

ogsbot commented Apr 30, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1603/

@ogsbot
Copy link
Member

ogsbot commented Apr 30, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1626/

@ogsbot
Copy link
Member

ogsbot commented Apr 30, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1604/

@ogsbot
Copy link
Member

ogsbot commented Apr 30, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1606/

@ogsbot
Copy link
Member

ogsbot commented Apr 30, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1628/

@chleh chleh mentioned this pull request May 1, 2016
Merged
5 tasks
@chleh
Copy link
Collaborator Author

chleh commented May 11, 2016

Jenkins, test this please.

@ogsbot
Copy link
Member

ogsbot commented May 11, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1708/

@chleh
Copy link
Collaborator Author

chleh commented May 11, 2016

DenseGaussAlgo test failed. the rest should be fine.

@norihiro-w
Copy link
Collaborator

norihiro-w commented May 12, 2016 •
edited by chleh

@chleh i have only one concern about #pragma once. I'm ok to merge this if you can fix it after your vacation. ✅

endJunction
endJunction reviewed May 12, 2016
View reviewed changes
MaterialsLib/Adsorption/CMakeLists.txt
file(GLOB Adsorption_SOURCES *.cpp)
file(GLOB Adsorption_HEADERS *.h)

add_library(MaterialsLibAdsorption STATIC ${Adsorption_HEADERS} ${Adsorption_SOURCES} )
Copy link
Member

@endJunction endJunction May 12, 2016 •
edited by chleh

Choose a reason for hiding this comment

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

I think STATIC is not needed here. ✅

@endJunction
Copy link
Member

endJunction commented May 12, 2016 •
edited by chleh

Additionally to #pragma once (for which one could open an issue) some files are missing the copyright headers. ✅

@chleh
Copy link
Collaborator Author

chleh commented May 12, 2016

Copyright headers added. Pragma once left for later.

@ogsbot
Copy link
Member

ogsbot commented May 24, 2016

Jenkins: OGS-6/Gui/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Gui/job/Win-PRs/1749/

@ogsbot
Copy link
Member

ogsbot commented May 24, 2016

Jenkins: OGS-6/Win-PRs failed: https://svn.ufz.de:8443/job/OGS-6/job/Win-PRs/1772/

@chleh
Copy link
Collaborator Author

chleh commented May 24, 2016

All comments addressed.

endJunction
endJunction reviewed May 24, 2016
View reviewed changes
MaterialsLib/Adsorption/ReactionCaOH2.cpp
{
T_s = T_solid;
this->p_gas = p_gas / 1e5; // convert Pa to bar
this->x_react = x_react;
Copy link
Member

@endJunction endJunction May 24, 2016 •
edited by chleh

Choose a reason for hiding this comment

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

Maybe renaming the arguments (adding _) would be better than this? ✅

@TomFischer TomFischer merged commit d6a8f15 into ufz:master May 25, 2016
@ogsbot
Copy link
Member

ogsbot commented May 25, 2016

Jenkins: OGS-6/Linux-PRs-dynamic failed: https://svn.ufz.de:8443/job/OGS-6/job/Linux-PRs-dynamic/138/

@ogsbot
Copy link
Member

ogsbot commented Jun 19, 2020

OpenGeoSys development has been moved to GitLab.

See this pull request on GitLab.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
5 participants
@chleh @ogsbot @norihiro-w @endJunction @TomFischer