Skip to content

Commit f0ba8ce

Browse files
committed
BUG: need magnitude of component
1 parent 82ba580 commit f0ba8ce

File tree

1 file changed

+15
-5
lines changed

1 file changed

+15
-5
lines changed

src/calc_neutral_derived.cpp

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -337,6 +337,8 @@ precision_t Neutrals::calc_dt(Grid grid) {
337337
static int iFunction = -1;
338338
report.enter(function, iFunction);
339339

340+
precision_t dt;
341+
340342
if (input.get_is_cubesphere())
341343
dt = calc_dt_cubesphere(grid);
342344
else {
@@ -382,6 +384,7 @@ precision_t Neutrals::calc_dt_cubesphere(Grid grid) {
382384
static int iFunction = -1;
383385
report.enter(function, iFunction);
384386

387+
precision_t dt;
385388
int iDir;
386389

387390
arma_vec dta(4);
@@ -401,11 +404,18 @@ precision_t Neutrals::calc_dt_cubesphere(Grid grid) {
401404
// Loop through altitudes
402405
for (int iAlt = 0; iAlt < nAlts; iAlt++) {
403406
// Conver cMax to contravariant velocity first
404-
arma_mat u1 = cMax_vcgc[0].slice(iAlt) % grid.A11_inv_scgc.slice(iAlt) + cMax_vcgc[1].slice(iAlt) % grid.A12_inv_scgc.slice(iAlt);
405-
arma_mat u2 = cMax_vcgc[0].slice(iAlt) % grid.A21_inv_scgc.slice(iAlt) + cMax_vcgc[1].slice(iAlt) % grid.A22_inv_scgc.slice(iAlt);
406-
407-
dtx.slice(iAlt) = grid.drefx(iAlt)*dummy_1 / u1;
408-
dty.slice(iAlt) = grid.drefy(iAlt)*dummy_1 / u2;
407+
arma_mat u1 = sqrt(
408+
cMax_vcgc[0].slice(iAlt) % grid.A11_inv_scgc.slice(iAlt) %
409+
cMax_vcgc[0].slice(iAlt) % grid.A11_inv_scgc.slice(iAlt) +
410+
cMax_vcgc[1].slice(iAlt) % grid.A12_inv_scgc.slice(iAlt) %
411+
cMax_vcgc[1].slice(iAlt) % grid.A12_inv_scgc.slice(iAlt));
412+
arma_mat u2 = sqrt(
413+
cMax_vcgc[0].slice(iAlt) % grid.A21_inv_scgc.slice(iAlt) %
414+
cMax_vcgc[0].slice(iAlt) % grid.A21_inv_scgc.slice(iAlt) +
415+
cMax_vcgc[1].slice(iAlt) % grid.A22_inv_scgc.slice(iAlt) %
416+
cMax_vcgc[1].slice(iAlt) % grid.A22_inv_scgc.slice(iAlt));
417+
dtx.slice(iAlt) = grid.drefx(iAlt) * dummy_1 / u1;
418+
dty.slice(iAlt) = grid.drefy(iAlt) * dummy_1 / u2;
409419
}
410420

411421
// simply some things, and just take the bulk value for now:

0 commit comments

Comments
 (0)