Skip to content

Commit 6cef850

Browse files
committed
initialize_metal_chemistry_rates -> init_misc_species_cool_rates
1 parent dfd9203 commit 6cef850

8 files changed

+45
-45
lines changed

.clang-format-ignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ src/clib/grackle_macros.h
3232
src/clib/grackle_units.c
3333
src/clib/index_helper.c
3434
src/clib/index_helper.h
35+
src/clib/init_misc_species_cool_rates.cpp
3536
src/clib/initialize_UVbackground_data.c
3637
src/clib/initialize_chemistry_data.cpp
3738
src/clib/initialize_cloudy_data.c
3839
src/clib/initialize_dust_yields.cpp
39-
src/clib/initialize_metal_chemistry_rates.cpp
4040
src/clib/initialize_rates.cpp
4141
src/clib/internal_types.hpp
4242
src/clib/internal_units.h

src/clib/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ add_library(Grackle_Grackle
107107
# C++ Source (and Private Header Files)
108108
cool_multi_time_g.cpp cool_multi_time_g.h
109109
init_extra_collisional_rates.hpp
110+
init_misc_species_cool_rates.cpp init_misc_species_cool_rates.hpp
110111
initialize_chemistry_data.cpp
111112
initialize_dust_yields.cpp initialize_dust_yields.hpp
112113
initialize_rates.cpp initialize_rates.hpp
113-
initialize_metal_chemistry_rates.cpp initialize_metal_chemistry_rates.hpp
114114
internal_types.cpp internal_types.hpp
115115
opaque_storage.hpp
116116
rate_utils.cpp

src/clib/Make.config.objects

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ OBJS_CONFIG_LIB = \
3030
initialize_chemistry_data.lo \
3131
initialize_cloudy_data.lo \
3232
initialize_dust_yields.lo \
33-
initialize_metal_chemistry_rates.lo \
33+
init_misc_species_cool_rates.lo \
3434
initialize_rates.lo \
3535
initialize_UVbackground_data.lo \
3636
interpolators_g.lo \

src/clib/initialize_metal_chemistry_rates.cpp renamed to src/clib/init_misc_species_cool_rates.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
//===----------------------------------------------------------------------===//
77
///
88
/// @file
9-
/// Implement machinery for initializing various (non-reaction) rates
9+
/// Implement machinery for initializing miscellaneous species cooling rates
1010
///
1111
//===----------------------------------------------------------------------===//
1212

@@ -18,7 +18,7 @@
1818
#include "grackle.h"
1919
#include "grackle_macros.h"
2020
#include "interp_table_utils.h" // free_interp_grid_
21-
#include "initialize_metal_chemistry_rates.hpp" // forward declarations
21+
#include "init_misc_species_cool_rates.hpp" // forward declarations
2222
#include "internal_units.h"
2323
#include "phys_constants.h"
2424
#include "grackle_rate_functions.h" // forward declarations of some funcs
@@ -66,7 +66,7 @@ static int add_cieY06_cool_rate(double **rate_ptr, double coolunit,
6666
return GR_SUCCESS;
6767
}
6868

69-
int grackle::impl::initialize_metal_chemistry_rates(
69+
int grackle::impl::init_misc_species_cool_rates(
7070
chemistry_data *my_chemistry, chemistry_data_storage *my_rates,
7171
code_units *my_units)
7272
{
@@ -95,8 +95,8 @@ int grackle::impl::initialize_metal_chemistry_rates(
9595
return GR_SUCCESS;
9696
}
9797

98-
int grackle::impl::free_metal_chemistry_rates(chemistry_data *my_chemistry,
99-
chemistry_data_storage *my_rates)
98+
int grackle::impl::free_misc_species_cool_rates(chemistry_data *my_chemistry,
99+
chemistry_data_storage *my_rates)
100100
{
101101
if (my_chemistry->primordial_chemistry == 0) {
102102
return GR_SUCCESS;
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
//===----------------------------------------------------------------------===//
2+
//
3+
// See the LICENSE file for license and copyright information
4+
// SPDX-License-Identifier: NCSA AND BSD-3-Clause
5+
//
6+
//===----------------------------------------------------------------------===//
7+
///
8+
/// @file
9+
/// Declares a function to initialize miscellaneous species cooling rates
10+
///
11+
//===----------------------------------------------------------------------===//
12+
13+
#ifndef INIT_MISC_SPECIES_COOL_RATES_HPP
14+
#define INIT_MISC_SPECIES_COOL_RATES_HPP
15+
16+
#include "grackle.h"
17+
18+
namespace grackle::impl {
19+
20+
int init_misc_species_cool_rates(chemistry_data* my_chemistry,
21+
chemistry_data_storage* my_rates,
22+
code_units* my_units);
23+
24+
int free_misc_species_cool_rates(chemistry_data* my_chemistry,
25+
chemistry_data_storage* my_rates);
26+
} // namespace grackle::impl
27+
28+
#endif /* INIT_MISC_SPECIES_COOL_RATES_HPP */

src/clib/initialize_chemistry_data.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
#include "grackle_macros.h"
2121
#include "auto_general.h"
2222
#include "interp_table_utils.h" // free_interp_grid_
23+
#include "init_misc_species_cool_rates.hpp" // free_misc_species_cool_rates
2324
#include "initialize_cloudy_data.h"
2425
#include "initialize_dust_yields.hpp" // free_dust_yields
25-
#include "initialize_metal_chemistry_rates.hpp" // free_metal_chemistry_rates
2626
#include "initialize_rates.hpp"
2727
#include "initialize_UVbackground_data.h"
2828
#include "internal_types.hpp" // drop_CollisionalRxnRateCollection
@@ -571,7 +571,7 @@ extern "C" int local_free_chemistry_data(chemistry_data *my_chemistry,
571571
free_interp_grid_(&my_rates->LHD);
572572

573573
// we deal with freeing other interp grids inside of
574-
// local_free_metal_chemistry_rates
574+
// free_misc_species_cool_rates
575575

576576
free_interp_grid_(&my_rates->alphap);
577577

@@ -613,9 +613,9 @@ extern "C" int local_free_chemistry_data(chemistry_data *my_chemistry,
613613
GRACKLE_FREE(my_rates->UVbackground_table.crsHeI);
614614
}
615615

616-
if (grackle::impl::free_metal_chemistry_rates(my_chemistry, my_rates) == FAIL) {
616+
if (grackle::impl::free_misc_species_cool_rates(my_chemistry, my_rates) != GR_SUCCESS) {
617617
fprintf(stderr, "Error in free_metal_chemistry_rates.\n");
618-
return FAIL;
618+
return GR_FAIL;
619619
}
620620

621621
if (grackle::impl::free_dust_yields(my_chemistry, my_rates) == FAIL) {

src/clib/initialize_metal_chemistry_rates.hpp

Lines changed: 0 additions & 28 deletions
This file was deleted.

src/clib/initialize_rates.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
#include "grackle_macros.h"
8888
#include "grackle_rate_functions.h"
8989
#include "init_extra_collisional_rates.hpp" // init_extra_collisional_rates
90+
#include "init_misc_species_cool_rates.hpp" // init_misc_species_cool_rates
9091
#include "initialize_dust_yields.hpp" // initialize_dust_yields
91-
#include "initialize_metal_chemistry_rates.hpp" // initialize_metal_chemistry_rates
9292
#include "initialize_rates.hpp"
9393
#include "internal_types.hpp" // new_CollisionalRxnRateCollection
9494
#include "LUT.hpp" // CollisionalRxnLUT
@@ -619,23 +619,23 @@ int grackle::impl::initialize_rates(
619619
//(Equation B15, Krumholz, 2014)
620620
add_scalar_reaction_rate(&my_rates->gamma_isrf, gamma_isrf_rate, coolingUnits, my_chemistry);
621621

622+
// initialize some extra collisional rates
622623
if (grackle::impl::init_extra_collisional_rates(my_chemistry, my_rates, my_units) != GR_SUCCESS) {
623624
fprintf(stderr, "Error in init_extra_collisional_rates.\n");
624625
return GR_FAIL;
625626
}
626627

627-
/* Metal chemistry rates */
628-
if (grackle::impl::initialize_metal_chemistry_rates(my_chemistry, my_rates, my_units) == FAIL) {
628+
// Miscellaneous species-based cooling rates
629+
if (grackle::impl::init_misc_species_cool_rates(my_chemistry, my_rates, my_units) != GR_SUCCESS) {
629630
fprintf(stderr, "Error in initialize_metal_chemistry_rates.\n");
630-
return FAIL;
631+
return GR_FAIL;
631632
}
632633
/* Dust rates */
633634
if (grackle::impl::initialize_dust_yields(my_chemistry, my_rates, my_units) == FAIL) {
634635
fprintf(stderr, "Error in initialize_dust_yields.\n");
635636
return FAIL;
636637
}
637638

638-
//End of function definition.
639639
return SUCCESS;
640640
}
641641

0 commit comments

Comments
 (0)