Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
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
16 changes: 8 additions & 8 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ src/clib/cie_thin_cooling_rate_tables.h
src/clib/cool1d_multi_g-cpp.C
src/clib/cool1d_multi_g-cpp.h
src/clib/cool_multi_time_g.cpp
src/clib/dynamic_api.c
src/clib/dynamic_api.cpp
src/clib/fortran_func_decls.h
src/clib/fortran_func_wrappers.hpp
src/clib/grackle_macros.h
Expand Down Expand Up @@ -64,17 +64,17 @@ src/include/grackle_float.h.in
src/include/grackle_misc.h
src/include/grackle_rate_functions.h
src/include/grackle_types.h
tests/unit/grtest_cmd.cpp
tests/unit/grtest_cmd.hpp
tests/unit/grtest_os.cpp
tests/unit/grtest_os.hpp
tests/unit/grtest_utils.cpp
tests/unit/grtest_utils.hpp
tests/grtestutils/cmd.cpp
tests/grtestutils/cmd.hpp
tests/grtestutils/os.cpp
tests/grtestutils/os.hpp
tests/grtestutils/utils.cpp
tests/grtestutils/utils.hpp
tests/grtestutils/googletest/check_allclose.hpp
tests/unit/test_chemistry_struct_synced.cpp
tests/unit/test_ghost_zone.cpp
tests/unit/test_interpolators_comparisons.cpp
tests/unit/test_linalg.cpp
tests/unit/test_status_reporting.cpp
tests/unit/test_unit_interpolators_g.cpp
tests/unit/utest_helpers.hpp

2 changes: 1 addition & 1 deletion src/clib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,6 @@ configure_file(auto_general.c.in auto_general.c @ONLY)
add_library(Grackle_Grackle

# C source files
dynamic_api.c
grackle_units.c
index_helper.c
initialize_cloudy_data.c initialize_cloudy_data.h
Expand Down Expand Up @@ -112,6 +111,7 @@ add_library(Grackle_Grackle
cool_multi_time_g.cpp cool_multi_time_g.h
dust_props.hpp
dust/grain_species_info.cpp dust/grain_species_info.hpp
dynamic_api.cpp
init_misc_species_cool_rates.cpp init_misc_species_cool_rates.hpp
initialize_chemistry_data.cpp
initialize_dust_yields.cpp initialize_dust_yields.hpp
Expand Down
21 changes: 16 additions & 5 deletions src/clib/chemistry_solver_funcs.hpp
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
// See LICENSE file for license and copyright information

/// @file chemistry_solver_funcs.hpp
//===----------------------------------------------------------------------===//
//
// See the LICENSE file for license and copyright information
// SPDX-License-Identifier: NCSA AND BSD-3-Clause
//
//===----------------------------------------------------------------------===//
///
/// @file
/// @brief Defines chemistry reaction related functions invoked by the
/// grackle solver in order to integrate the species densities over time.
///
Expand All @@ -14,6 +19,8 @@
/// be decoupled from the derivative calculation for primoridial species
/// - it may also make sense to further divide logic by the kinds of species
/// that are affected (e.g. primordial vs grains)
///
//===----------------------------------------------------------------------===//

#ifndef CHEMISTRY_SOLVER_FUNCS_HPP
#define CHEMISTRY_SOLVER_FUNCS_HPP
Expand Down Expand Up @@ -579,7 +586,9 @@ inline void species_density_updates_gauss_seidel(

if ( (my_chemistry->metal_chemistry == 1) &&
(itmask_metal[i] != MASK_FALSE) ) {
scoef = scoef;
// we comment out the following line that assigns scoef to itself since
// it has no practical impact and produces a compiler warning
// scoef = scoef;
acoef = acoef
+ kcol_buf.data[CollisionalRxnLUT::kz44][i] * CII(i,j,k) / 12.
+ kcol_buf.data[CollisionalRxnLUT::kz45][i] * OII(i,j,k) / 16.
Expand Down Expand Up @@ -1932,7 +1941,9 @@ inline void species_density_derivatives_0d(

if ((my_chemistry->metal_chemistry == 1) &&
(itmask_metal[0] != MASK_FALSE)) {
scoef = scoef;
// we comment out the following line that assigns scoef to itself since
// it has no practical impact and produces a compiler warning
// scoef = scoef;
acoef = acoef
+ kcr_buf.data[CollisionalRxnLUT::kz44][0] * CII / 12.
+ kcr_buf.data[CollisionalRxnLUT::kz45][0] * OII / 16.
Expand Down
136 changes: 0 additions & 136 deletions src/clib/dynamic_api.c

This file was deleted.

Loading