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.

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

clean model configuration #177

Merged
merged 1 commit into from
Mar 22, 2024
Merged

clean model configuration #177

merged 1 commit into from
Mar 22, 2024

Conversation

jbreue16
Copy link
Contributor

@jbreue16 jbreue16 commented Mar 12, 2024

We should separate all model parameters from discretization parameters in the input file (fixes #176 ).
This should not be a breaking change so we have to make sure that the old interface is read when the new one is not present.

Move NBOUND from discretization to unit_XXX

Move NPARTYPE from discretization to unit_XXX

Move PAR_GEOM from discretization to unit_XXX

@jbreue16
Copy link
Contributor Author

@sleweke @schmoelder you think this is good to be squashed and merged?

Copy link
Contributor

@schmoelder schmoelder left a comment

Choose a reason for hiding this comment

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

This PR addresses some long standing inconsistencies in the interface while also ensuring backwards compatibility. For future modifications, we should instead refer to the CADET-Specification repo (still WIP) and make sure to update the spec to the currently supported spec version of CADET-Core.

@jbreue16 jbreue16 force-pushed the chore/clean_model_config branch from 9d6a3e9 to 2ba7fa7 Compare March 22, 2024 14:27
Some model parameters were written in the discretization group and are moved to the model group. Backwards compatibility of the interface is ensured. See #177

Move NBOUND from discretization to unit_XXX

Move NPARTYPE from discretization to unit_XXX

Move PAR_GEOM from discretization to unit_XXX
@jbreue16 jbreue16 force-pushed the chore/clean_model_config branch from 2ba7fa7 to c8317a7 Compare March 22, 2024 14:33
@jbreue16 jbreue16 merged commit 59806c0 into master Mar 22, 2024
3 checks passed
@jbreue16 jbreue16 deleted the chore/clean_model_config branch March 22, 2024 14:39
jbreue16 added a commit that referenced this pull request Apr 2, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)
jbreue16 added a commit that referenced this pull request Apr 17, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)
jbreue16 added a commit that referenced this pull request Apr 22, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request Apr 22, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request Apr 22, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request May 5, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit to jbreue16/CADET that referenced this pull request May 8, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to cadet#177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request May 23, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit to jbreue16/CADET that referenced this pull request May 28, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to cadet#177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit to jbreue16/CADET that referenced this pull request May 31, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to cadet#177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit to jbreue16/CADET that referenced this pull request Jun 3, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to cadet#177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request Jun 18, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request Jun 18, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
jbreue16 added a commit that referenced this pull request Jun 18, 2024
* Change DG unit interfaces from unit_type suffix to discretization specification

* Infer DG disc from NCOL and NPAR and set default values

* Rename DG element fields to nelem and par_nelem

* Fix test interfaces, i.e. adjust to createUnitOperation function

* Improve parameter interface DG units (according to #177)

Co-authored-by: sleweke <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

Separate all model parameters from discretization parameters in input file
2 participants