From 3a0c3402d05ef40e3541dfb35f999da279b2d5bd Mon Sep 17 00:00:00 2001 From: Miikka Vaisala Date: Thu, 22 Aug 2019 19:07:25 +0800 Subject: [PATCH] Critical bug correction. --- src/standalone/renderer.cc | 12 +++++++----- src/standalone/simulation.cc | 2 +- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/standalone/renderer.cc b/src/standalone/renderer.cc index a78c14c..a9608ea 100644 --- a/src/standalone/renderer.cc +++ b/src/standalone/renderer.cc @@ -390,12 +390,8 @@ run_renderer(void) timer_reset(&io_timer); /* Step the simulation */ -#if 1 - const AcReal umax = acReduceVec(RTYPE_MAX, VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ); - const AcReal dt = host_timestep(umax, mesh_info); - #if LSINK - const AcReal sum_mass = acReduceScal(RTYPE_MAX, VTXBUF_ACCRETION); + const AcReal sum_mass = acReduceScal(RTYPE_SUM, VTXBUF_ACCRETION); accreted_mass = accreted_mass + sum_mass; AcReal sink_mass = mesh_info.real_params[AC_M_sink_init] + accreted_mass; printf("sink mass is: %e \n", sink_mass); @@ -409,6 +405,12 @@ run_renderer(void) loadForcingParamsToDevice(forcing_params); #endif + +#if 1 + const AcReal umax = acReduceVec(RTYPE_MAX, VTXBUF_UUX, VTXBUF_UUY, VTXBUF_UUZ); + const AcReal dt = host_timestep(umax, mesh_info); + + acIntegrate(dt); #else ModelMesh* model_mesh = modelmesh_create(mesh->info); diff --git a/src/standalone/simulation.cc b/src/standalone/simulation.cc index 8c4ffd0..14f6ed1 100644 --- a/src/standalone/simulation.cc +++ b/src/standalone/simulation.cc @@ -263,7 +263,7 @@ run_simulation(void) #if LSINK - const AcReal sum_mass = acReduceScal(RTYPE_MAX, VTXBUF_ACCRETION); + const AcReal sum_mass = acReduceScal(RTYPE_SUM, VTXBUF_ACCRETION); accreted_mass = accreted_mass + sum_mass; AcReal sink_mass = 0.0; sink_mass = mesh_info.real_params[AC_M_sink_init] + accreted_mass;