Merge branch 'main' into feature/pythonInterface/eos
This commit is contained in:
2
.gitignore
vendored
2
.gitignore
vendored
@@ -69,6 +69,8 @@ subprojects/packagecache/
|
|||||||
subprojects/hypre/
|
subprojects/hypre/
|
||||||
subprojects/qhull/
|
subprojects/qhull/
|
||||||
|
|
||||||
|
qhull.wrap
|
||||||
|
|
||||||
.vscode/
|
.vscode/
|
||||||
|
|
||||||
*.log
|
*.log
|
||||||
|
|||||||
@@ -358,8 +358,8 @@ namespace serif::eos::helmholtz {
|
|||||||
// hash the table location in t, rho:
|
// hash the table location in t, rho:
|
||||||
jat = (log10(T) - tlo)*tstpi;
|
jat = (log10(T) - tlo)*tstpi;
|
||||||
jat = max(0, min(jat, table.jmax-1)); // bounds
|
jat = max(0, min(jat, table.jmax-1)); // bounds
|
||||||
iat = max(0, min(iat, table.imax-1)); // bounds
|
|
||||||
iat = (log10(din)-dlo)*dstpi;
|
iat = (log10(din)-dlo)*dstpi;
|
||||||
|
iat = max(0, min(iat, table.imax-1)); // bounds
|
||||||
|
|
||||||
//using the indices, access the table:
|
//using the indices, access the table:
|
||||||
fi[0] = table.f[iat][jat];
|
fi[0] = table.f[iat][jat];
|
||||||
|
|||||||
@@ -1,2 +0,0 @@
|
|||||||
[wrap-redirect]
|
|
||||||
filename = opat-core/subprojects/qhull.wrap
|
|
||||||
Reference in New Issue
Block a user