Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/basic_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -379,7 +379,7 @@ jobs:
fcompiler: intel-classic
fversion: "2021.9"
- os: windows-latest
toolchain:
toolchain:
ccompiler: msvc
cversion: latest
fcompiler: intel
Expand All @@ -405,7 +405,7 @@ jobs:
path: extern/gfe
submodules: true

- name: Set up Fortran compiler
- name: Set up Fortran compiler
if: ${{ runner.os != 'Windows' || matrix.toolchain.fcompiler != 'gcc' }}
uses: fortran-lang/setup-fortran@v1
with:
Expand Down Expand Up @@ -464,7 +464,7 @@ jobs:
cmake --build build/extern/gfe --target install

- name: Configure (linux)
if: ${{runner.os != 'Windows' || matrix.toolchain.ccompiler != 'msvc'}}
if: ${{runner.os != 'Windows' || matrix.toolchain.ccompiler != 'msvc'}}
run: |
cmake -S . -B build -G Ninja \
-DCMAKE_PREFIX_PATH=build/install \
Expand Down Expand Up @@ -504,6 +504,6 @@ jobs:
if: runner.os == 'Windows'
run: |
./build/source/cea.exe -h

- name: Run ctest
run: ctest --test-dir build --output-on-failure
24 changes: 12 additions & 12 deletions source/bind/c/cea.h
Original file line number Diff line number Diff line change
Expand Up @@ -303,15 +303,15 @@ extern "C"
const cea_equilibrium_type type,
const cea_real state1,
const cea_real state2,
const cea_array amounts,
const cea_real amounts[],
cea_eqsolution soln);

cea_err cea_eqsolver_solve_with_partials(
const cea_eqsolver solver,
const cea_equilibrium_type type,
const cea_real state1,
const cea_real state2,
const cea_array amounts,
const cea_real amounts[],
cea_eqsolution soln,
cea_eqpartials eqpartials);

Expand Down Expand Up @@ -430,14 +430,14 @@ extern "C"
cea_err cea_rocket_solver_solve_iac(
const cea_rocket_solver solver,
cea_rocket_solution soln,
const cea_array weights,
const cea_real weights[],
const cea_real pc,
// Optional: ignored when n_pi_p == 0 (pi_p may be NULL)
const cea_array pi_p,
const cea_real pi_p[],
const cea_int n_pi_p,
const cea_array subar,
const cea_real subar[],
const cea_int nsubar,
const cea_array supar,
const cea_real supar[],
const cea_int nsupar,
const cea_int n_frz,
const cea_real hc_or_tc,
Expand All @@ -448,14 +448,14 @@ extern "C"
cea_err cea_rocket_solver_solve_fac(
const cea_rocket_solver solver,
cea_rocket_solution soln,
const cea_array weights,
const cea_real weights[],
const cea_real pc,
// Optional: ignored when n_pi_p == 0 (pi_p may be NULL)
const cea_array pi_p,
const cea_real pi_p[],
const cea_int n_pi_p,
const cea_array subar,
const cea_real subar[],
const cea_int nsubar,
const cea_array supar,
const cea_real supar[],
const cea_int nsupar,
const cea_int n_frz,
const cea_real hc_or_tc,
Expand Down Expand Up @@ -554,7 +554,7 @@ extern "C"
cea_err cea_shock_solver_solve(
const cea_shock_solver solver,
cea_shock_solution soln,
const cea_array weights,
const cea_real weights[],
const cea_real T0,
const cea_real p0,
const cea_real mach1_or_u1,
Expand Down Expand Up @@ -640,7 +640,7 @@ extern "C"
cea_err cea_detonation_solver_solve(
const cea_detonation_solver solver,
cea_detonation_solution soln,
const cea_array weights,
const cea_real weights[],
const cea_real T1,
const cea_real p1,
const bool frozen);
Expand Down
Loading
Loading