Skip to content

Commit fc0dfde

Browse files
slayooslayoo
authored
more auto return type qualifiers (open-atmos#184)
1 parent 5d34b60 commit fc0dfde

10 files changed

+63
-62
lines changed

‎src/aero_data.hpp

+10-10
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ struct AeroData {
3737
gimmick_ptr().reset(); // TODO #117: guard
3838
}
3939

40-
static int spec_by_name(const AeroData &self, const std::string &name) {
40+
static auto spec_by_name(const AeroData &self, const std::string &name) {
4141
int value;
4242
const int name_size = name.size();
4343
f_aero_data_spec_by_name(
@@ -67,7 +67,7 @@ struct AeroData {
6767
);
6868
}
6969

70-
static double get_frac_dim(const AeroData &self) {
70+
static auto get_frac_dim(const AeroData &self) {
7171
double value;
7272
f_aero_data_get_frac_dim(
7373
self.ptr.f_arg(),
@@ -83,7 +83,7 @@ struct AeroData {
8383
);
8484
}
8585

86-
static double get_prime_radius(AeroData &self) {
86+
static auto get_prime_radius(AeroData &self) {
8787
double value;
8888
f_aero_data_get_prime_radius(
8989
self.ptr.f_arg(),
@@ -99,7 +99,7 @@ struct AeroData {
9999
);
100100
}
101101

102-
static double get_vol_fill_factor(const AeroData &self) {
102+
static auto get_vol_fill_factor(const AeroData &self) {
103103
double value;
104104
f_aero_data_get_vol_fill_factor(
105105
self.ptr.f_arg(),
@@ -108,7 +108,7 @@ struct AeroData {
108108
return value;
109109
}
110110

111-
static double rad2vol(const AeroData &self, const double radius) {
111+
static auto rad2vol(const AeroData &self, const double radius) {
112112
double vol;
113113
f_aero_data_rad2vol(
114114
self.ptr.f_arg(),
@@ -118,7 +118,7 @@ struct AeroData {
118118
return vol;
119119
}
120120

121-
static double vol2rad(const AeroData &self, const double vol) {
121+
static auto vol2rad(const AeroData &self, const double vol) {
122122
double radius;
123123
f_aero_data_vol2rad(
124124
self.ptr.f_arg(),
@@ -128,7 +128,7 @@ struct AeroData {
128128
return radius;
129129
}
130130

131-
static double diam2vol(const AeroData &self, const double diam) {
131+
static auto diam2vol(const AeroData &self, const double diam) {
132132
double vol;
133133
f_aero_data_diam2vol(
134134
self.ptr.f_arg(),
@@ -138,7 +138,7 @@ struct AeroData {
138138
return vol;
139139
}
140140

141-
static double vol2diam(const AeroData &self, const double vol) {
141+
static auto vol2diam(const AeroData &self, const double vol) {
142142
double diam;
143143
f_aero_data_vol2diam(
144144
self.ptr.f_arg(),
@@ -148,7 +148,7 @@ struct AeroData {
148148
return diam;
149149
}
150150

151-
static std::valarray<double> densities(const AeroData &self) {
151+
static auto densities(const AeroData &self) {
152152
int len;
153153
f_aero_data_len(
154154
self.ptr.f_arg(),
@@ -166,7 +166,7 @@ struct AeroData {
166166
return data;
167167
}
168168

169-
static double density(const AeroData &self, const std::string &name) {
169+
static auto density(const AeroData &self, const std::string &name) {
170170
int idx;
171171
double data;
172172
const int name_size = name.size();

‎src/aero_mode.hpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ struct AeroMode {
124124
gimmick_ptr().reset();
125125
}
126126

127-
static double get_num_conc(const AeroMode &self){
127+
static auto get_num_conc(const AeroMode &self){
128128
double val;
129129
f_aero_mode_get_num_conc(self.ptr.f_arg(), &val);
130130
return val;
@@ -134,7 +134,7 @@ struct AeroMode {
134134
f_aero_mode_set_num_conc(self.ptr.f_arg_non_const(), &val);
135135
}
136136

137-
static std::valarray<double> num_dist(const AeroMode &self,
137+
static auto num_dist(const AeroMode &self,
138138
const BinGrid &bin_grid, const AeroData &aero_data)
139139
{
140140
int len;
@@ -166,7 +166,7 @@ struct AeroMode {
166166
);
167167
}
168168

169-
static std::valarray<double> get_vol_frac(const AeroMode &self)
169+
static auto get_vol_frac(const AeroMode &self)
170170
{
171171
int len;
172172
f_aero_mode_get_n_spec(self.ptr.f_arg(), &len);
@@ -189,7 +189,7 @@ struct AeroMode {
189189
);
190190
}
191191

192-
static std::valarray<double> get_vol_frac_std(const AeroMode &self)
192+
static auto get_vol_frac_std(const AeroMode &self)
193193
{
194194
int len;
195195
f_aero_mode_get_n_spec(self.ptr.f_arg(), &len);
@@ -198,7 +198,7 @@ struct AeroMode {
198198
return data;
199199
}
200200

201-
static double get_char_radius(const AeroMode &self){
201+
static auto get_char_radius(const AeroMode &self){
202202
double val;
203203
f_aero_mode_get_char_radius(self.ptr.f_arg(), &val);
204204
return val;
@@ -208,7 +208,7 @@ struct AeroMode {
208208
f_aero_mode_set_char_radius(self.ptr.f_arg_non_const(), &val);
209209
}
210210

211-
static double get_gsd(const AeroMode &self){
211+
static auto get_gsd(const AeroMode &self){
212212
double val;
213213
f_aero_mode_get_gsd(self.ptr.f_arg(), &val);
214214
return val;
@@ -261,7 +261,7 @@ struct AeroMode {
261261
f_aero_mode_set_type(self.ptr.f_arg_non_const(), &type);
262262
}
263263

264-
static std::string get_type(const AeroMode &self) {
264+
static auto get_type(const AeroMode &self) {
265265
int type;
266266
f_aero_mode_get_type(self.ptr.f_arg(), &type);
267267

‎src/aero_particle.hpp

+12-12
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ struct AeroParticle {
4545
throw std::runtime_error("AeroData size mistmatch");
4646
}
4747

48-
static std::valarray<double> volumes(const AeroParticle &self)
48+
static auto volumes(const AeroParticle &self)
4949
{
5050
int len = AeroData::__len__(*self.aero_data);
5151
std::valarray<double> data(len);
@@ -57,7 +57,7 @@ struct AeroParticle {
5757
return data;
5858
}
5959

60-
static double volume(const AeroParticle &self) {
60+
static auto volume(const AeroParticle &self) {
6161
double vol;
6262
f_aero_particle_volume(
6363
self.ptr.f_arg(),
@@ -66,7 +66,7 @@ struct AeroParticle {
6666
return vol;
6767
}
6868

69-
static double species_volume(const AeroParticle &self, const int &i_spec) {
69+
static auto species_volume(const AeroParticle &self, const int &i_spec) {
7070
double vol;
7171
f_aero_particle_species_volume(
7272
self.ptr.f_arg(),
@@ -76,7 +76,7 @@ struct AeroParticle {
7676
return vol;
7777
}
7878

79-
static double dry_volume(const AeroParticle &self) {
79+
static auto dry_volume(const AeroParticle &self) {
8080
double vol;
8181
f_aero_particle_dry_volume(
8282
self.ptr.f_arg(),
@@ -86,7 +86,7 @@ struct AeroParticle {
8686
return vol;
8787
}
8888

89-
static double radius(const AeroParticle &self) {
89+
static auto radius(const AeroParticle &self) {
9090
double radius;
9191
f_aero_particle_radius(
9292
self.ptr.f_arg(),
@@ -96,7 +96,7 @@ struct AeroParticle {
9696
return radius;
9797
}
9898

99-
static double dry_radius(const AeroParticle &self) {
99+
static auto dry_radius(const AeroParticle &self) {
100100
double radius;
101101
f_aero_particle_dry_radius(
102102
self.ptr.f_arg(),
@@ -106,7 +106,7 @@ struct AeroParticle {
106106
return radius;
107107
}
108108

109-
static double diameter(const AeroParticle &self) {
109+
static auto diameter(const AeroParticle &self) {
110110
double diameter;
111111
f_aero_particle_diameter(
112112
self.ptr.f_arg(),
@@ -116,7 +116,7 @@ struct AeroParticle {
116116
return diameter;
117117
}
118118

119-
static double dry_diameter(const AeroParticle &self) {
119+
static auto dry_diameter(const AeroParticle &self) {
120120
double diameter;
121121
f_aero_particle_dry_diameter(
122122
self.ptr.f_arg(),
@@ -126,7 +126,7 @@ struct AeroParticle {
126126
return diameter;
127127
}
128128

129-
static double mass(const AeroParticle &self) {
129+
static auto mass(const AeroParticle &self) {
130130
double mass;
131131
f_aero_particle_mass(
132132
self.ptr.f_arg(),
@@ -136,7 +136,7 @@ struct AeroParticle {
136136
return mass;
137137
}
138138

139-
static double species_mass(const AeroParticle &self, const int &i_spec) {
139+
static auto species_mass(const AeroParticle &self, const int &i_spec) {
140140
double mass;
141141
f_aero_particle_species_mass(
142142
self.ptr.f_arg(),
@@ -147,7 +147,7 @@ struct AeroParticle {
147147
return mass;
148148
}
149149

150-
static std::valarray<double> species_masses(const AeroParticle &self) {
150+
static auto species_masses(const AeroParticle &self) {
151151
int len = AeroData::__len__(*self.aero_data);
152152
std::valarray<double> masses(len);
153153
f_aero_particle_species_masses(
@@ -159,7 +159,7 @@ struct AeroParticle {
159159
return masses;
160160
}
161161

162-
static double solute_kappa(const AeroParticle &self) {
162+
static auto solute_kappa(const AeroParticle &self) {
163163
double kappa;
164164
f_aero_particle_solute_kappa(
165165
self.ptr.f_arg(),

‎src/aero_state.hpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ struct AeroState {
131131
return len;
132132
}
133133

134-
static double total_num_conc(const AeroState &self) {
134+
static auto total_num_conc(const AeroState &self) {
135135
double total_num_conc;
136136
f_aero_state_total_num_conc(
137137
self.ptr.f_arg(),
@@ -141,7 +141,7 @@ struct AeroState {
141141
return total_num_conc;
142142
}
143143

144-
static double total_mass_conc(const AeroState &self) {
144+
static auto total_mass_conc(const AeroState &self) {
145145
double total_mass_conc;
146146
f_aero_state_total_mass_conc(
147147
self.ptr.f_arg(),
@@ -151,7 +151,7 @@ struct AeroState {
151151
return total_mass_conc;
152152
}
153153

154-
static std::valarray<double> num_concs(const AeroState &self) {
154+
static auto num_concs(const AeroState &self) {
155155
int len;
156156
f_aero_state_len(
157157
self.ptr.f_arg(),
@@ -169,7 +169,7 @@ struct AeroState {
169169
return num_concs;
170170
}
171171

172-
static std::valarray<double> masses(
172+
static auto masses(
173173
const AeroState &self
174174
) {
175175
int len;
@@ -189,7 +189,7 @@ struct AeroState {
189189
return masses;
190190
}
191191

192-
static std::valarray<double> dry_diameters(const AeroState &self) {
192+
static auto dry_diameters(const AeroState &self) {
193193
int len;
194194
f_aero_state_len(
195195
self.ptr.f_arg(),
@@ -207,7 +207,7 @@ struct AeroState {
207207
return dry_diameters;
208208
}
209209

210-
static std::valarray<double> diameters(
210+
static auto diameters(
211211
const AeroState &self
212212
) {
213213
int len;
@@ -227,7 +227,7 @@ struct AeroState {
227227
return diameters;
228228
}
229229

230-
static std::valarray<double> volumes(
230+
static auto volumes(
231231
const AeroState &self
232232
) {
233233
int len;
@@ -247,7 +247,7 @@ struct AeroState {
247247
return volumes;
248248
}
249249

250-
static std::valarray<double> crit_rel_humids(
250+
static auto crit_rel_humids(
251251
const AeroState &self,
252252
const EnvState &env_state
253253
) {
@@ -269,7 +269,7 @@ struct AeroState {
269269
return crit_rel_humids;
270270
}
271271

272-
static std::tuple<double, double, double> mixing_state(
272+
static auto mixing_state(
273273
const AeroState &self
274274
) {
275275
int len;

‎src/bin_grid.hpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ struct BinGrid {
8383
return len;
8484
}
8585

86-
static std::valarray<double> edges(const BinGrid &self)
86+
static auto edges(const BinGrid &self)
8787
{
8888
int len;
8989
f_bin_grid_size(
@@ -100,7 +100,7 @@ struct BinGrid {
100100
return data;
101101
}
102102

103-
static std::valarray<double> centers(const BinGrid &self)
103+
static auto centers(const BinGrid &self)
104104
{
105105
int len;
106106
f_bin_grid_size(
@@ -117,7 +117,7 @@ struct BinGrid {
117117
}
118118
};
119119

120-
std::valarray<double> histogram_1d(
120+
auto histogram_1d(
121121
const BinGrid &bin_grid,
122122
std::valarray<double> values,
123123
std::valarray<double> weights
@@ -141,7 +141,7 @@ std::valarray<double> histogram_1d(
141141
return data;
142142
}
143143

144-
std::vector<std::vector<double>> histogram_2d(
144+
auto histogram_2d(
145145
const BinGrid &x_bin_grid,
146146
std::valarray<double> x_values,
147147
const BinGrid &y_bin_grid,

0 commit comments

Comments
 (0)