Skip to content

Updating branch #1

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
Merged
capriatim merged 31 commits into from
Jun 3, 2025
Merged

Updating branch #1

capriatim merged 31 commits into from
Jun 3, 2025

Conversation

@capriatim
Copy link
Owner

@capriatim capriatim commented Jun 3, 2025

No description provided.

jbscoggi and others added 30 commits August 1, 2022 12:33
@jbscoggi
Merge pull request #208 from capriatim/master
4cb6e3a 
fix issue #141, air 11 mech
@mgoodson-cvd
Remove pybind11 submodule.
54794e9 
Remove old local pybind11 submodule.

See #230
@mgoodson-cvd
git subrepo clone (merge) --branch=stable https://github.com/pybind/p…
11d6086 
…ybind11 thirdparty/pybind11

subrepo:
  subdir:   "thirdparty/pybind11"
  merged:   "be97c5a9"
upstream:
  origin:   "https://github.com/pybind/pybind11"
  branch:   "stable"
  commit:   "be97c5a9"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

See #230. Closes #230.
@mgoodson-cvd
git subrepo pull (merge) --branch=Catch1.x thirdparty/catch
30cd754 
subrepo:
  subdir:   "thirdparty/catch"
  merged:   "aff01ed3"
upstream:
  origin:   "https://github.com/philsquared/Catch.git"
  branch:   "Catch1.x"
  commit:   "908c370f"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

See #229. Closes #229.
@mgoodson-cvd
Fix bug with XML function not returning a value.
c722b9b 
Fix a bug with an overload of `getChildElementObject`.
It was not returning a value despite being declared as bool.

See #232. Closes #232.
@mgoodson-cvd
Remove ubuntu-18.04 from GitHub actions.
37ae9ce 
Remove `ubuntu-18.04` from the build actions for GitHub.
The 18.04 image was deprecated in April 2023.

See #237. Closes #237.
@rdbisme
Merge pull request #233 from mgoodson-cvd/230-update-pybind11-to-v2_10_4
4a3ee5c 
Closes #229, #230, #232, #237.
@mgoodson-cvd @jbscoggi
Update electron molecular weight. (#211)
e4aa76e 
* Increase precision of electron molecular weight.

Increase the precision of the electron molecular weight
in `elements.xml` to match the value provided by
the NASA-9 thermo database.

Also update the unit tests with the same electron molecular weight.

See #210. Closes #210.

* Fix bug with XML function not returning a value.

Fix a bug with an overload of `getChildElementObject`.
It was not returning a value despite being declared as bool.

See #210.

* git subrepo pull (merge) --branch=Catch1.x thirdparty/catch

subrepo:
  subdir:   "thirdparty/catch"
  merged:   "aff01ed3"
upstream:
  origin:   "https://github.com/philsquared/Catch.git"
  branch:   "Catch1.x"
  commit:   "908c370f"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Remove pybind11 submodule.

Remove old local pybind11 submodule.

See #230

* git subrepo clone (merge) --branch=stable https://github.com/pybind/pybind11 thirdparty/pybind11

subrepo:
  subdir:   "thirdparty/pybind11"
  merged:   "be97c5a9"
upstream:
  origin:   "https://github.com/pybind/pybind11"
  branch:   "stable"
  commit:   "be97c5a9"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo"
  commit:   "110b9eb"

* Update version to 1.1.3

Update version number to 1.1.3

See #210.

---------

Co-authored-by: J.B. Scoggins <jbscoggi@gmail.com>
@Fratorhe @jbscoggi @rdbisme
added feature required by pyCabaret (#216)
eb8ab74 
* added feature required by pyCabaret

* added test

* Removed print statement

---------

Co-authored-by: Fran <fratorhe@vki.ac.be>
Co-authored-by: J.B. Scoggins <jbscoggi@gmail.com>
Co-authored-by: Ruben Di Battista <8077364+rdbisme@users.noreply.github.com>
@ggange @jbscoggi @rdbisme
added instructions to build local python package (#215)
3ac9898 
* added instructions to build local python package

* fixed installation for python wrapper + mention new zsh shell

* Update installation.md

* updated installation.md

---------

Co-authored-by: J.B. Scoggins <jbscoggi@gmail.com>
Co-authored-by: Ruben Di Battista <8077364+rdbisme@users.noreply.github.com>
@mgoodson-cvd @rdbisme
Closes #240. Clean up docs (#241)
fcbd298 
* Revamp collision integral documentation.

Revamp the collision integral documentation.
Fix the formatting, add citations to bibliography,
fix spelling, etc.

See #240. Closes #240.

* Update NASA CEA paper link.

Update the NASA CEA paper link in the bibliography.
The old link was dead.

See #240.

* Replace unicode math with LaTeX.

Replace unicode math in the GSI section of the documentation
with LaTeX equivalent.

See #240.

* Change math delimiter to new GitHub form.

Change the math delimiters to match the new GitHub form
for Markdown. There were issues rendering online with the old form.

See #240.

---------

Co-authored-by: Ruben Di Battista <8077364+rdbisme@users.noreply.github.com>
@mgoodson-cvd
Clean up formatting in Transport.
44468fd 
Clean up formatting in `Transport.cpp`
Replace tabs with spaces and align all text appropriately.

See #239.
@mgoodson-cvd
Fix several bugs in meanFreePath.
fdf63ab 
Fix several bugs in `meanFreePath` routine.

First, the computation would fail when the mixture did not
contain electrons because the `Q11ee` and `Q11ei` arrays
are not allocated when electrons are not present.

Second, the indexing of `Q11` array was incorrect.
The symmetric matrix is stored as a flattened upper-diagonal array
which must be accounted for when indexing and cannot be
accessed like a matrix.

Third, the off-diagonal terms for the electron were only being
counted once instead of twice.

Also remove unused variables and avoid unnecessary copies.

Update the Python test to include test on `meanFreePath`.

See #239. Closes #239.
@mgoodson-cvd
Enable mean free path output in mppequil.
02ccd6c 
Enable the output of mean free path in `mppequil`.
It was there but commented out, probably because it was broken.

See #239.
@mgoodson-cvd
Fix issues in electronMeanFreePath.
c3fadb3 
Fix an issue in `electronMeanFreePath` computation
in which the off-diagonal term was not being counted twice.

Also remove unused variables and avoid copies when possible.

See #239.
@mgoodson-cvd
Use meanFreePath in coulombMeanCollisionTime.
32ba2f6 
Use the `meanFreePath` function in the computation of
`coulombMeanCollisionTime` to avoid redundant code.

See #239.
@mgoodson-cvd
Fix averageHeavyCollisionFreq in Python interface.
2ea8fc5 
Fix an issue with the `averageHeavyCollisionFreq` function
in the Python interface.
It was incorrectly returning the `electronHeavyCollisionFreq`,
likely due to a copy-paste error.

Update the value now that `meanFreePath` is fixed in #239.

See #221. Closes #221.
@mgoodson-cvd
Remove unused CMake option BUILD_PYTHON_WRAPPER.
d223045 
Remove an unused CMake option `BUILD_PYTHON_WRAPPER`.
It does nothing and is removed to avoid confusion.

See #247. Closes #247.
@mgoodson-cvd
Merge pull request #222 from mgoodson-cvd/221-bug-in-python-interface…
24e54da 
…-with-averageHeavyCollisionFreq

Closes #221, #239, #247. Fix mean free path, fix Python interface, and remove old CMake option.
@mgoodson-cvd
Added new functions to the Fortran API. (#249)
87fa5db 
Added a new function to the Fortran API to retrieve the mass
fractions of the gas mixture at the current state. In our
application, this was used in conjuction with the GSI surface
mass balance function, which requires passing the the mass
fractions of the pyrolysis gas mixture and the boundary layer
gas mixture.

See #130

Co-authored-by: Joseph Schulz <joseph.c.schulz@nasa.gov>
@mgoodson-cvd @rdbisme
Make constants constexpr.
a6f3a00 
Make the constants `constexpr` rather than just `const`.
This should improve performance by setting the values at compile-time
rather than run-time.

See #250. Closes #250.
@mgoodson-cvd @rdbisme
Add Stefan-Boltzmann constant.
fbdb6e7 
Add the Stefan-Boltzmann constant to `Constants.h`.
Use in the GSI routines.

See #251. Closes #251.
@mgoodson-cvd
Add missing include for cwrapper.h.
0afef98 
Add a missing include for `cwrapper.h`.
`stdbool.h` header is needed for `bool` in pure C.

See #253. Closes #253.
@mgoodson-cvd
Merge pull request #256 from mgoodson-cvd/253-c-wrapper-stdbool
aa01785 
Closes #253. Add missing include for `cwrapper.h`.
@mgoodson-cvd
Remove unused use_transport flag.
4c1d328 
Remove unused `use_transport` flag from documentation on the mixture
file inputs. Also removes a similar flag in the `MixtureOptions` class.
This flag was intended as a means to disable loading transport
but was never implemented.

See #258. Closes #258.
@mgoodson-cvd
Update contributors list.
bc221f4 
Add Matthew Goodson (Corvid Technologies) to the contributors list.

See #258.
@BBArrosDias
Merge pull request #259 from mgoodson-cvd/258-remove-use-transport-flag
0b8da42 
Closes #258. Remove `use_transport` flag
@pato-devel
Fixing MillikanWhite_test with Approx credits go to George
3f052e9
@BBArrosDias
Merge pull request #268 from mutationpp/fix_MillikanWhite_test
a982995 
Fixing MillikanWhite_test with Approx credits go to George
@BBArrosDias @rdbisme
adding new functions and test to the python wrapper
aefb496
@capriatim capriatim merged commit 88de3ad into capriatim:master Jun 3, 2025
5 of 7 checks passed
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

Development

Successfully merging this pull request may close these issues.

8 participants

@capriatim @jbscoggi @mgoodson-cvd @rdbisme @Fratorhe @ggange @BBArrosDias @pato-devel