Skip to content

Conversation

baperry2
Copy link
Contributor

@baperry2 baperry2 commented Nov 5, 2024

These get read from the table metadata rather than specified at compile time. Therefore, to define them, eosparm needs to be passed to the appropriate function. The implementation should be backward compatible and only require the modified call signature when using Manifold EOS.

This PR also modifies the out-of-class EOS function templates work to eliminate EOS.cpp and reduce redundant code, but perhaps is less readable? Open to suggestion on this.

@marchdf
Copy link
Contributor

marchdf commented Nov 5, 2024

I am fine with this moving the definitions to the header. The only thing is making sure the linkers don't hit "multiple definition" type of errors.

@baperry2
Copy link
Contributor Author

baperry2 commented Nov 5, 2024

The multiple definition error is resolved by marking the template specializations as inline

@baperry2 baperry2 force-pushed the specnames branch 2 times, most recently from 0ea1c12 to fe205d8 Compare November 8, 2024 22:48
@baperry2 baperry2 merged commit 9625a85 into AMReX-Combustion:development Dec 6, 2024
9 checks passed
@baperry2 baperry2 deleted the specnames branch December 6, 2024 20:39
terencelehmann pushed a commit to ITV-RWTH/PelePhysics that referenced this pull request Dec 10, 2024
* simplify templated functions in EOS.cpp

* rearrange template specializations in EOS.cpp so they are all in header; improve speciesNames function for manifold

* SYCL ifdef for manifold speciesnames

* pass host eosparm to reactors

* ignitionDelay: remove one invalid call for manifold eos

* fix dumb bug

* clang-tidy unused arguments
baperry2 added a commit that referenced this pull request Dec 23, 2024
* ceptr: Added functionality for reading and converting PLOG reactions.

* Do formatting with black

* Run isort and flake8

* Latest upstream pull (#2)

* pin intel-oneapi version in CI (#541)

* Bump Submodules/amrex from `8349789` to `00e6f75` (#540)

Bumps [Submodules/amrex](https://github.com/AMReX-Codes/amrex) from `8349789` to `00e6f75`.
- [Release notes](https://github.com/AMReX-Codes/amrex/releases)
- [Commits](AMReX-Codes/amrex@8349789...00e6f75)

---
updated-dependencies:
- dependency-name: Submodules/amrex
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruce Perry <Bruce.Perry@nrel.gov>

* Make EOS functions templates to allow for CellData as an argument (#536)

* template for celldata in EOS

* static asserts in templates

* templating for RY2 functions for all EOS

* Fix clang-tidy (#535)

* fix unused variable

* free shared ptr for manfunc parm

---------

Co-authored-by: Marc T. Henry de Frahan <marc.henrydefrahan@nrel.gov>

* Unit conversions (#539)

* Utilities and unit conversions

* Formatting

* 2 structs and renamed functions to avoid macros issue

* Templating and namespaces

* Added Utilities to Docs

* Overload instead of templating

* Fixed nested namespaces for clang-tidy error in PeleLMeX, removed Utilities.H from PelePhysics.H.wq (#545)

* Update CI to ubuntu-24.04 (#546)

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Bruce Perry <Bruce.Perry@nrel.gov>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc T. Henry de Frahan <marc.henrydefrahan@nrel.gov>
Co-authored-by: Dave Montgomery <David.Montgomery@nrel.gov>
Co-authored-by: Jon Rood <jon.rood@nrel.gov>

* Adding example mechanism for PLOG evaluation

* Bump Submodules/amrex from `00e6f75` to `f27eb69` (#550)

Bumps [Submodules/amrex](https://github.com/AMReX-Codes/amrex) from `00e6f75` to `f27eb69`.
- [Release notes](https://github.com/AMReX-Codes/amrex/releases)
- [Commits](AMReX-Codes/amrex@00e6f75...f27eb69)

---
updated-dependencies:
- dependency-name: Submodules/amrex
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* speciesNames for Manifold EOS (#542)

* simplify templated functions in EOS.cpp

* rearrange template specializations in EOS.cpp so they are all in header; improve speciesNames function for manifold

* SYCL ifdef for manifold speciesnames

* pass host eosparm to reactors

* ignitionDelay: remove one invalid call for manifold eos

* fix dumb bug

* clang-tidy unused arguments

* ceptr: create pressure-specific folders for plog mechanism, move plog_pressure var into mechanism object

* ceptr: implement command line and list options to specify plog pressure

* ceptr: Add plog mech to list_mech

* ceptr: Copy Make.package to the plog subfolder

* add docs on plog mechanism conversion

* fix typo

fix another typo

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Thomas Howarth <69794367+ThomasHowarth@users.noreply.github.com>
Co-authored-by: Bruce Perry <Bruce.Perry@nrel.gov>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Marc T. Henry de Frahan <marc.henrydefrahan@nrel.gov>
Co-authored-by: Dave Montgomery <David.Montgomery@nrel.gov>
Co-authored-by: Jon Rood <jon.rood@nrel.gov>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants