diff --git a/data_for_test.py b/data_for_test.py index bde2cd974fb711349107e23ebf51e308b3c05316..7970a6283fe66f83f7bff8e365840de6529c0751 100644 --- a/data_for_test.py +++ b/data_for_test.py @@ -44,6 +44,8 @@ class FluxDataSingle: self.oscillation_pos = u.transposed_array_from_string(oscillation_pos_str) self.oscillation_neg = u.transposed_array_from_string(oscillation_neg_str) + self.combined_frozen_metrics = 1.0 + self.weno_weights_pos = u.transposed_array_from_string(weno_weights_pos_str) self.weno_weights_neg = u.transposed_array_from_string(weno_weights_neg_str) diff --git a/test.py b/test.py index 671b7fe606f27d44b93dfd6f761ad7ab6a5878c6..da3abad7faeaf936b440bde78d3c1da10fbb2a84 100644 --- a/test.py +++ b/test.py @@ -33,7 +33,7 @@ def test_weno_flux_uniform_grid(ctx_factory, flux_test_data_fixture): generalized_fluxes=data.fluxes, characteristic_fluxes_pos=data.char_fluxes_pos, characteristic_fluxes_neg=data.char_fluxes_neg, - combined_frozen_metrics=1.0, + combined_frozen_metrics=data.combined_frozen_metrics, R=data.R, flux=flux_dev) @@ -65,7 +65,7 @@ def test_dissipation_part_pos_uniform_grid(ctx_factory, flux_test_data_fixture): prg(queue, nvars=data.nvars, characteristic_fluxes=data.char_fluxes_pos, - combined_frozen_metrics=1.0, + combined_frozen_metrics=data.combined_frozen_metrics, R=data.R, dissipation_pos=dissipation_dev) @@ -82,7 +82,7 @@ def test_dissipation_part_neg_uniform_grid(ctx_factory, flux_test_data_fixture): prg(queue, nvars=data.nvars, characteristic_fluxes=data.char_fluxes_neg, - combined_frozen_metrics=1.0, + combined_frozen_metrics=data.combined_frozen_metrics, R=data.R, dissipation_neg=dissipation_dev) @@ -99,7 +99,7 @@ def test_weno_weights_pos_uniform_grid(ctx_factory, flux_test_data_fixture): prg(queue, nvars=data.nvars, characteristic_fluxes=data.char_fluxes_pos, - combined_frozen_metrics=1.0, + combined_frozen_metrics=data.combined_frozen_metrics, w=weights_dev) sum_weights = np.sum(weights_dev.get(), axis=1) @@ -118,7 +118,7 @@ def test_weno_weights_neg_uniform_grid(ctx_factory, flux_test_data_fixture): prg(queue, nvars=data.nvars, characteristic_fluxes=data.char_fluxes_neg, - combined_frozen_metrics=1.0, + combined_frozen_metrics=data.combined_frozen_metrics, w=weights_dev) sum_weights = np.sum(weights_dev.get(), axis=1)