Cantera / cantera

Chemical kinetics, thermodynamics, and transport tool suite
https://cantera.org
Other
602 stars 346 forks source link

Fixes to help with conda-forge builds #1591

Closed speth closed 1 year ago

speth commented 1 year ago

Changes proposed in this pull request

Fixes to resolve issues encountered while trying to update the conda-forge recipe (see conda-forge/cantera-feedstock#27), plus (unrelated) removal of a few unnecessary declarations.

Checklist

ischoegl commented 1 year ago

There is another tolerance issue in #1271 (which was resolved by patching downstream) - I'd consider adopting this for the same rationale as provided here for conda-forge?

speth commented 1 year ago

I stand by my comment in that PR, and don't think the patch proposed there should be adopted as our baseline. It's not even clear at this point whether that patch is still necessary on those systems, or whether it was just a transient due to specific builds of g++ and/or glibc.

ischoegl commented 1 year ago

I stand by my comment in that PR, and don't think the patch proposed there should be adopted as our baseline. It's not even clear at this point whether that patch is still necessary on those systems, or whether it was just a transient due to specific builds of g++ and/or glibc.

Sure. I was mainly asking as the tolerance adjustment was pretty minor, going from rtol = 1e-14; to rtol = 1.2e-14; - see proposed change. I'm fine either way, but I thought I'd bring it up. PS: It is true that it is no longer clear whether this is needed any longer, and it probably shouldn't change under those circumstances.

codecov[bot] commented 1 year ago

Codecov Report

Merging #1591 (c85fdb5) into main (cde1e79) will decrease coverage by 0.03%. Report is 2 commits behind head on main. The diff coverage is 16.66%.

:exclamation: Current head c85fdb5 differs from pull request most recent head 2ba2cb0. Consider uploading reports for the commit 2ba2cb0 to get more accurate results

@@            Coverage Diff             @@
##             main    #1591      +/-   ##
==========================================
- Coverage   70.61%   70.58%   -0.03%     
==========================================
  Files         379      379              
  Lines       59153    59169      +16     
  Branches    21252    21257       +5     
==========================================
- Hits        41768    41762       -6     
- Misses      14311    14331      +20     
- Partials     3074     3076       +2     
Files Changed Coverage Δ
include/cantera/numerics/DenseMatrix.h 100.00% <ø> (ø)
include/cantera/transport/MultiTransport.h 50.00% <ø> (ø)
samples/clib/demo.c 77.77% <0.00%> (-19.90%) :arrow_down:
src/base/application.cpp 59.51% <42.85%> (-0.99%) :arrow_down:

... and 1 file with indirect coverage changes

:mega: We’re building smart automated test selection to slash your CI/CD build times. Learn more