Skip to content

Commit 2274a46

Browse files
abukowski21abukowski21
committed
BUG: Remove need to do altitude gradient. use k only.
change all d_alt_lower - dk_edge_m and d_alt_denter - dk_center_m
1 parent aae064f commit 2274a46

9 files changed

+23
-24
lines changed

‎src/calc_dt.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ precision_t calc_dt_vertical(Grid grid, std::vector<arma_cube> cMax_vcgc) {
141141
precision_t dt;
142142

143143
if (grid.get_nZ(false) > 1) {
144-
arma_cube dtz = grid.dalt_center_scgc / cMax_vcgc[2];
144+
arma_cube dtz = grid.dk_center_m_scgc / cMax_vcgc[2];
145145
dt = dtz.min();
146146
} else
147147
dt = 1e32;

‎src/calc_ion_temperature.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ void Ions::calc_ion_temperature(Neutrals neutrals, Grid grid,
8484
lambda1d(1) = lambda1d(2);
8585
lambda1d(0) = lambda1d(2);
8686
front1d = 3.0 / 2.0 * cKB * density_scgc.tube(iLon, iLat);
87-
dalt1d = grid.dalt_lower_scgc.tube(iLon, iLat);
87+
dalt1d = grid.dk_edge_m.tube(iLon, iLat);
8888
sources1d = (heating_neutral_friction_scgc.tube(iLon, iLat) +
8989
heating_neutral_heat_transfer_scgc.tube(iLon, iLat));
9090
sources1d = sources1d / front1d;
@@ -122,7 +122,7 @@ void Ions::calc_ion_temperature(Neutrals neutrals, Grid grid,
122122
lambda1d(1) = lambda1d(2);
123123
lambda1d(0) = lambda1d(2);
124124
front1d = 3.0 / 2.0 * cKB * species[iIon].density_scgc.tube(iLon, iLat);
125-
dalt1d = grid.dalt_lower_scgc.tube(iLon, iLat);
125+
dalt1d = grid.dk_edge_m.tube(iLon, iLat);
126126
sources1d = (species[iIon].heating_neutral_friction_scgc.tube(iLon, iLat) +
127127
species[iIon].heating_neutral_heat_transfer_scgc.tube(iLon, iLat));
128128
sources1d = sources1d / front1d;

‎src/grid_spacing.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void Grid::calc_grid_spacing(Planets planet) {
1212

1313
report.print(3, "starting calc_grid_spacing");
1414

15-
calc_alt_grid_spacing();
15+
// calc_alt_grid_spacing();
1616
calc_lat_grid_spacing();
1717
calc_long_grid_spacing();
1818

‎src/ions_bcs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ bool Ions::set_upper_bcs(Grid grid) {
9191
species[iSpecies].temperature_scgc.slice(iAlt) /
9292
species[iSpecies].temperature_scgc.slice(iAlt - 1) %
9393
species[iSpecies].density_scgc.slice(iAlt - 1) %
94-
exp(-grid.dalt_lower_scgc.slice(iAlt) / h);
94+
exp(-grid.dk_edge_m.slice(iAlt) / h);
9595
species[iSpecies].velocity_vcgc[2].slice(iAlt).zeros();
9696
}
9797
}

‎src/neutrals_bcs.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ bool Neutrals::set_upper_bcs(Grid grid) {
9393
h = species[iSpecies].scale_height_scgc.slice(iAlt);
9494
species[iSpecies].density_scgc.slice(iAlt) =
9595
species[iSpecies].density_scgc.slice(iAlt - 1) %
96-
exp(-grid.dalt_lower_scgc.slice(iAlt) / h);
96+
exp(-grid.dk_edge_m.slice(iAlt) / h);
9797
}
9898
}
9999

@@ -216,7 +216,7 @@ bool Neutrals::set_lower_bcs(Grid grid,
216216
temperature_scgc.slice(iAlt + 1) /
217217
temperature_scgc.slice(iAlt) %
218218
species[iSpecies].density_scgc.slice(iAlt + 1) %
219-
exp(grid.dalt_lower_scgc.slice(iAlt) / sh_ave);
219+
exp(grid.dk_edge_m.slice(iAlt) / sh_ave);
220220
}
221221

222222
for (iAlt = nGCs - 1; iAlt >= 0; iAlt--) {

‎src/neutrals_energy.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void Neutrals::update_temperature(Grid grid, Times time) {
6060
//temp1d = temp1d + dt * sources1d;
6161
//sources1d.zeros();
6262

63-
dalt1d = grid.dalt_lower_scgc.tube(iLon, iLat);
63+
dalt1d = grid.dk_edge_m.tube(iLon, iLat);
6464
conduction1d.zeros();
6565

6666
conduction1d = solver_conduction(temp1d,

‎src/neutrals_momentum_viscosity.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ void Neutrals::update_horizontal_velocity(Grid grid, Times time) {
6464
lambda1d = lambda3d.tube(iLon, iLat);
6565
rhor21d = rhor23d.tube(iLon, iLat);
6666
sources1d.zeros();
67-
dalt1d = grid.dalt_lower_scgc.tube(iLon, iLat);
67+
dalt1d = grid.dk_edge_m.tube(iLon, iLat);
6868
visc1d.zeros();
6969

7070
visc1d = solver_conduction(vel1d,

‎src/solver_gradients.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -448,10 +448,9 @@ arma_mat project_onesided_alt_3rd(arma_cube value, Grid grid, int64_t iAlt) {
448448
grid.MeshCoef1s3rdp5.slice(iAlt) % value.slice(iAlt + 5);
449449
*/
450450
gradient = (value.slice(iAlt + 2) - value.slice(iAlt + 1)) /
451-
grid.dalt_lower_scgc.slice(iAlt + 2);
451+
grid.dk_edge_m.slice(iAlt + 2);
452452

453-
valueOut = value.slice(iAlt + 1) - gradient % grid.dalt_lower_scgc.slice(
454-
iAlt + 1);
453+
valueOut = value.slice(iAlt + 1) - gradient % grid.dk_edge_m.slice(iAlt + 1);
455454
return valueOut;
456455
}
457456

‎src/solver_vertical_rusanov.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ void calc_facevalues_alts_rusanov(Grid &grid,
3636

3737
// Only do calculation on physical cells
3838
for (iZ = nGCs; iZ < nZs - nGCs; iZ++) {
39-
ida = 2.0 / grid.dalt_lower_scgc.slice(iZ + 1);
39+
ida = 2.0 / grid.dk_edge_m.slice(iZ + 1);
4040
dVarUp = ida %
4141
(factor1 * (inVar.slice(iZ + 1) - inVar.slice(iZ)) -
4242
factor2 * (inVar.slice(iZ + 2) - inVar.slice(iZ - 1)));
4343

44-
ida = 2.0 / grid.dalt_lower_scgc.slice(iZ);
44+
ida = 2.0 / grid.dk_edge_m.slice(iZ);
4545
dVarDown = ida %
4646
(factor1 * (inVar.slice(iZ) - inVar.slice(iZ - 1)) -
4747
factor2 * (inVar.slice(iZ + 1) - inVar.slice(iZ - 2)));
@@ -55,9 +55,9 @@ void calc_facevalues_alts_rusanov(Grid &grid,
5555

5656
// Ghostcell closest to the bottom physical cell:
5757
iZ = nGCs - 1;
58-
ida = 1.0 / grid.dalt_lower_scgc.slice(iZ + 1);
58+
ida = 1.0 / grid.dk_edge_m.slice(iZ + 1);
5959
dVarUp = ida % (inVar.slice(iZ + 1) - inVar.slice(iZ));
60-
ida = 1.0 / grid.dalt_lower_scgc.slice(iZ);
60+
ida = 1.0 / grid.dk_edge_m.slice(iZ);
6161
dVarDown = ida % (inVar.slice(iZ) - inVar.slice(iZ - 1));
6262

6363
for (iX = nGCs; iX < nXs - nGCs; iX++)
@@ -67,9 +67,9 @@ void calc_facevalues_alts_rusanov(Grid &grid,
6767

6868
// Ghostcell closest to the top physical cell:
6969
iZ = nZs - nGCs;
70-
ida = 1.0 / grid.dalt_lower_scgc.slice(iZ + 1);
70+
ida = 1.0 / grid.dk_edge_m.slice(iZ + 1);
7171
dVarUp = ida % (inVar.slice(iZ + 1) - inVar.slice(iZ));
72-
ida = 1.0 / grid.dalt_lower_scgc.slice(iZ);
72+
ida = 1.0 / grid.dk_edge_m.slice(iZ);
7373
dVarDown = ida % (inVar.slice(iZ) - inVar.slice(iZ - 1));
7474

7575
for (iX = nGCs; iX < nXs - nGCs; iX++)
@@ -80,10 +80,10 @@ void calc_facevalues_alts_rusanov(Grid &grid,
8080
for (iZ = nGCs; iZ < nZs - nGCs + 1; iZ++) {
8181
outLeft.slice(iZ) =
8282
inVar.slice(iZ - 1) +
83-
0.5 * dVarLimited.slice(iZ - 1) % grid.dalt_lower_scgc.slice(iZ);
83+
0.5 * dVarLimited.slice(iZ - 1) % grid.dk_edge_m.slice(iZ);
8484
outRight.slice(iZ) =
8585
inVar.slice(iZ) -
86-
0.5 * dVarLimited.slice(iZ) % grid.dalt_lower_scgc.slice(iZ);
86+
0.5 * dVarLimited.slice(iZ) % grid.dk_edge_m.slice(iZ);
8787
}
8888

8989
/*
@@ -94,7 +94,7 @@ void calc_facevalues_alts_rusanov(Grid &grid,
9494
<< inVar(7,19,19) << " "
9595
<< inVar(7,19,20) << " "
9696
<< dVarLimited(7,19,18) << " "
97-
<< grid.dalt_lower_scgc(7,19,17) << " "
97+
<< grid.dk_edge_m(7,19,17) << " "
9898
<< outRight(7, 19, 17) << " "
9999
<< outRight(7, 19, 18) << " "
100100
<< outLeft(7, 19, 17) << " "
@@ -142,7 +142,7 @@ void calc_grad_and_diff_alts_rusanov(Grid &grid,
142142
outGrad.slice(iZ) = 0.5 *
143143
(varLeft.slice(iZ + 1) + varRight.slice(iZ + 1) -
144144
varLeft.slice(iZ) - varRight.slice(iZ)) /
145-
grid.dalt_center_scgc.slice(iZ);
145+
grid.dk_center_m_scgc.slice(iZ);
146146

147147
/*
148148
if (iProc == 11)
@@ -151,7 +151,7 @@ void calc_grad_and_diff_alts_rusanov(Grid &grid,
151151
<< varLeft(7, 19, 18) << " "
152152
<< varRight(7, 19, 17) << " "
153153
<< varRight(7, 19, 18) << " "
154-
<< grid.dalt_center_scgc(7, 19, 17) << " "
154+
<< grid.dk_edge_m(7, 19, 17) << " "
155155
<< outGrad(7, 19, 17) << "\n";
156156
*/
157157
for (iZ = nGCs; iZ < nZs - nGCs + 1; iZ++) {
@@ -177,7 +177,7 @@ void calc_grad_and_diff_alts_rusanov(Grid &grid,
177177
for (iZ = nGCs; iZ < nZs - nGCs; iZ++)
178178
outDiff.slice(iZ) =
179179
(diffFlux.slice(iZ + 1) - diffFlux.slice(iZ)) /
180-
grid.dalt_center_scgc.slice(iZ);
180+
grid.dk_center_m_scgc.slice(iZ);
181181

182182
report.exit(function);
183183
return;

0 commit comments

Comments
 (0)