Skip to content

Commit

Permalink
Revert "trap_flux_bug"
Browse files Browse the repository at this point in the history
This reverts commit f3401d0.
  • Loading branch information
dmarce1 committed Nov 15, 2021
1 parent f3401d0 commit f3c54ca
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 58 deletions.
45 changes: 3 additions & 42 deletions src/grid.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1840,36 +1840,7 @@ timestep_t grid::compute_fluxes() {
const interaction_host_kernel_type host_type = opts().hydro_host_kernel_type;
const interaction_device_kernel_type device_type = opts().hydro_device_kernel_type;
const size_t device_queue_length = opts().cuda_buffer_capacity;
for (integer i = 0; i < INX; ++i) {
for (integer j = 0; j < INX; ++j) {
for (integer k = 0; k < INX; ++k) {
for( int f = 0; f < opts().n_fields; f++) {
if( std::isnan( U[f][hindex(i, j, k)] ) ) {
print( "NaN found in field f = %i i = %i j = %i k = %i\n", f, i, j, k );
abort();
}
}
}
}
}
auto rc = launch_hydro_kernels(hydro, U, X, omega, F, host_type, device_type, device_queue_length);
for (integer i = 0; i < INX; ++i) {
for (integer j = 0; j < INX; ++j) {
for (integer k = 0; k < INX; ++k) {
for( int f = 0; f < opts().n_fields; f++) {
for( int dim = 0; dim < NDIM; dim++) {
if( std::isnan( F[dim][f][findex(i, j, k)] ) ) {
print( "NaN found in flux dim = %i f = %i i = %i j = %i k = %i\n", dim, f, i, j, k );
abort();
}
}
}
}
}
}


return rc;
return launch_hydro_kernels(hydro, U, X, omega, F, host_type, device_type, device_queue_length);

}

Expand Down Expand Up @@ -2238,15 +2209,12 @@ void grid::next_u(integer rk, real t, real dt) {
const integer iii0 = h0index(i - H_BW, j - H_BW, k - H_BW);
const integer iii = hindex(i, j, k);
dUdt[egas_i][iii0] += (dphi_dt[iii0] * U[rho_i][iii]) * HALF;
if( std::isnan(dUdt[egas_i][iii]) ) {
print( "NaN in %s on %i index %i\n", __FILE__, __LINE__, iii );
abort();
}
}
}
}

std::vector<real> du_out(opts().n_fields, ZERO);

std::vector<real> ds(NDIM, ZERO);
for (integer i = H_BW; i != H_NX - H_BW; ++i) {
for (integer j = H_BW; j != H_NX - H_BW; ++j) {
Expand All @@ -2258,10 +2226,6 @@ void grid::next_u(integer rk, real t, real dt) {
const real u1 = U[field][iii] + dUdt[field][iii0] * dt;
const real u0 = U0[field][h0index(i - H_BW, j - H_BW, k - H_BW)];
U[field][iii] = (ONE - rk_beta[rk]) * u0 + rk_beta[rk] * u1;
if( std::isnan(U[field][iii]) ) {
print( "NaN in %s on %i field %i index %i\n", __FILE__, __LINE__, field, iii );
abort();
}
}
}
}
Expand Down Expand Up @@ -2321,13 +2285,10 @@ void grid::next_u(integer rk, real t, real dt) {
}
for (integer i = H_BW; i != H_NX - H_BW; ++i) {
for (integer j = H_BW; j != H_NX - H_BW; ++j) {
//#pragma GCC ivdep
#pragma GCC ivdep
for (integer k = H_BW; k != H_NX - H_BW; ++k) {
const integer iii = hindex(i, j, k);
if (opts().tau_floor > 0.0) {
if( std::isnan(U[tau_i][iii]) ) {
print( "NaN in %s on %i\n", __FILE__, __LINE__ );
}
U[tau_i][iii] = std::max(U[tau_i][iii], opts().tau_floor);
} else if (U[tau_i][iii] < ZERO) {
print("Tau is negative- %e %i %i %i %e %e %e\n", real(U[tau_i][iii]), int(i), int(j), int(k), (double) X[XDIM][iii],
Expand Down
17 changes: 1 addition & 16 deletions src/node_server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@
#include "octotiger/problem.hpp"
#include "octotiger/taylor.hpp"
#include "octotiger/util.hpp"
#include "octotiger/interaction_types.hpp"\

#include <fenv.h>
#include "octotiger/interaction_types.hpp"

#include "octotiger/monopole_interactions/monopole_kernel_interface.hpp"
#include "octotiger/multipole_interactions/multipole_kernel_interface.hpp"
Expand Down Expand Up @@ -363,17 +361,11 @@ void node_server::initialize(real t, real rt) {
}

node_server::~node_server() {
feenableexcept(FE_DIVBYZERO);
feenableexcept(FE_INVALID);
feenableexcept(FE_OVERFLOW);
}

node_server::node_server(const node_location &loc, const node_client &parent_id, real t, real rt, std::size_t _step_num, std::size_t _hcycle,
std::size_t _rcycle, std::size_t _gcycle) :
my_location(loc), parent(parent_id) {
feenableexcept(FE_DIVBYZERO);
feenableexcept(FE_INVALID);
feenableexcept(FE_OVERFLOW);
initialize(t, rt);
step_num = _step_num;
gcycle = _gcycle;
Expand All @@ -384,9 +376,6 @@ node_server::node_server(const node_location &loc, const node_client &parent_id,
node_server::node_server(const node_location &_my_location, integer _step_num, bool _is_refined, real _current_time, real _rotational_time,
const std::array<integer, NCHILD> &_child_d, grid _grid, const std::vector<hpx::id_type> &_c, std::size_t _hcycle, std::size_t _rcycle,
std::size_t _gcycle, integer position_) {
feenableexcept(FE_DIVBYZERO);
feenableexcept(FE_INVALID);
feenableexcept(FE_OVERFLOW);
my_location = _my_location;
initialize(_current_time, _rotational_time);
position = position_;
Expand All @@ -405,11 +394,7 @@ node_server::node_server(const node_location &_my_location, integer _step_num, b
child_descendant_count = _child_d;
}


void node_server::compute_fmm(gsolve_type type, bool energy_account, bool aonly) {
feenableexcept(FE_DIVBYZERO);
feenableexcept(FE_INVALID);
feenableexcept(FE_OVERFLOW);
if (!opts().gravity) {
return;
}
Expand Down

0 comments on commit f3c54ca

Please sign in to comment.