Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

O

ogs
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

63bfbefa

Commit 63bfbefa authored 2 years ago by Dmitri Naumov

Downloads
- Plain Diff

Merge branch 'iapws-thermal-conductivity' into 'master'

[MPL] Adding IAPWS model of thermal conductivity of water to MPL

See merge request ogs/ogs!4445

parents d356cbe4 b567b773

No related branches found

No related tags found

Loading

Changes 8

Hide whitespace changes

Inline Side-by-side

Showing

Documentation/ProjectFile/properties/property/t_WaterThermalConductivityIAPWS.md 1 addition, 0 deletions

...le/properties/property/t_WaterThermalConductivityIAPWS.md
MaterialLib/MPL/CreateProperty.cpp 6 additions, 1 deletion

MaterialLib/MPL/CreateProperty.cpp
MaterialLib/MPL/Properties/CreateProperties.h 1 addition, 0 deletions

MaterialLib/MPL/Properties/CreateProperties.h
MaterialLib/MPL/Properties/ThermalConductivity/CreateWaterThermalConductivityIAPWS.cpp 34 additions, 0 deletions

...ermalConductivity/CreateWaterThermalConductivityIAPWS.cpp
MaterialLib/MPL/Properties/ThermalConductivity/CreateWaterThermalConductivityIAPWS.h 26 additions, 0 deletions

...ThermalConductivity/CreateWaterThermalConductivityIAPWS.h
MaterialLib/MPL/Properties/ThermalConductivity/WaterThermalConductivityIAPWS.cpp 201 additions, 0 deletions

...ies/ThermalConductivity/WaterThermalConductivityIAPWS.cpp
MaterialLib/MPL/Properties/ThermalConductivity/WaterThermalConductivityIAPWS.h 63 additions, 0 deletions

...rties/ThermalConductivity/WaterThermalConductivityIAPWS.h
Tests/MaterialLib/TestMPLWaterThermalConductivity.cpp 78 additions, 0 deletions

Tests/MaterialLib/TestMPLWaterThermalConductivity.cpp

with 410 additions and 1 deletion

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment