From 7fa99816ef6b5b99d4d8db7f2c16b0ac5f73888c Mon Sep 17 00:00:00 2001 From: Shikhar Kumar Date: Mon, 20 Aug 2018 18:39:53 -0400 Subject: [PATCH] Some more merge conflict fixes --- include/openmc.h | 1 - openmc/capi/tally.py | 3 --- src/input_xml.F90 | 26 +++++++++++++------------- src/tallies/tally_header.F90 | 4 +++- 4 files changed, 16 insertions(+), 18 deletions(-) diff --git a/include/openmc.h b/include/openmc.h index 406da2c175..a193c517ea 100644 --- a/include/openmc.h +++ b/include/openmc.h @@ -116,7 +116,6 @@ extern "C" { int openmc_tally_set_nuclides(int32_t index, int n, const char** nuclides); int openmc_tally_set_scores(int32_t index, int n, const char** scores); int openmc_tally_set_type(int32_t index, const char* type); - int openmc_tally_update_type(int32_t index, const char* type); int openmc_zernike_filter_get_order(int32_t index, int* order); int openmc_zernike_filter_get_params(int32_t index, double* x, double* y, double* r); int openmc_zernike_filter_set_order(int32_t index, int order); diff --git a/openmc/capi/tally.py b/openmc/capi/tally.py index eaf8caf202..44bf89415b 100644 --- a/openmc/capi/tally.py +++ b/openmc/capi/tally.py @@ -84,9 +84,6 @@ _dll.openmc_tally_set_scores.errcheck = _error_handler _dll.openmc_tally_set_type.argtypes = [c_int32, c_char_p] _dll.openmc_tally_set_type.restype = c_int _dll.openmc_tally_set_type.errcheck = _error_handler -_dll.openmc_tally_update_type.argtypes = [c_int32, c_char_p] -_dll.openmc_tally_update_type.restype = c_int -_dll.openmc_tally_update_type.errcheck = _error_handler _SCORES = { diff --git a/src/input_xml.F90 b/src/input_xml.F90 index d85ae853d4..a2b1a1fd93 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -2171,7 +2171,7 @@ contains else call fatal_error("Could not find filter " & // trim(to_str(temp_filter(j))) // " specified on tally " & - // trim(to_str(tally_id))) + // trim(to_str(t % id))) end if ! Store the index of the filter @@ -2225,7 +2225,7 @@ contains if (.not. nuclide_dict % has(word)) then call fatal_error("Could not find the nuclide " & // trim(word) // " specified in tally " & - // trim(to_str(tally_id)) // " in any material.") + // trim(to_str(t % id)) // " in any material.") end if ! Set bin to index in nuclides array @@ -2535,7 +2535,7 @@ contains if (t % score_bins(j) == t % score_bins(k)) then call fatal_error("Duplicate score of type '" // trim(& reaction_name(t % score_bins(j))) // "' found in tally " & - // trim(to_str(tally_id))) + // trim(to_str(t % id))) end if end do end do @@ -2582,7 +2582,7 @@ contains end if else call fatal_error("No specified on tally " & - // trim(to_str(tally_id)) // ".") + // trim(to_str(t % id)) // ".") end if ! Check for a tally derivative. @@ -2605,7 +2605,7 @@ contains if (j == size(tally_derivs)) then call fatal_error("Could not find derivative " & // trim(to_str(t % deriv)) // " specified on tally " & - // trim(to_str(tally_id))) + // trim(to_str(t % id))) end if end do @@ -2613,7 +2613,7 @@ contains .or. tally_derivs(t % deriv) % variable == DIFF_TEMPERATURE) then if (any(t % nuclide_bins == -1)) then if (t % find_filter(FILTER_ENERGYOUT) > 0) then - call fatal_error("Error on tally " // trim(to_str(tally_id)) & + call fatal_error("Error on tally " // trim(to_str(t % id)) & // ": Cannot use a 'nuclide_density' or 'temperature' & &derivative on a tally with an outgoing energy filter and & &'total' nuclide rate. Instead, tally each nuclide in the & @@ -2690,7 +2690,7 @@ contains temp_str = to_lower(temp_str) else call fatal_error("Must specify trigger type for tally " // & - trim(to_str(tally_id)) // " in tally XML file.") + trim(to_str(t % id)) // " in tally XML file.") end if ! Get the convergence threshold for the trigger @@ -2698,7 +2698,7 @@ contains call get_node_value(node_trigger, "threshold", threshold) else call fatal_error("Must specify trigger threshold for tally " // & - trim(to_str(tally_id)) // " in tally XML file.") + trim(to_str(t % id)) // " in tally XML file.") end if ! Get list scores for this trigger @@ -2742,7 +2742,7 @@ contains t % triggers(trig_ind) % type = RELATIVE_ERROR case default call fatal_error("Unknown trigger type " // & - trim(temp_str) // " in tally " // trim(to_str(tally_id))) + trim(temp_str) // " in tally " // trim(to_str(t % id))) end select ! Store the trigger convergence threshold @@ -2763,7 +2763,7 @@ contains ! Check if an invalid score was set for the trigger if (t % triggers(trig_ind) % score_index == 0) then call fatal_error("The trigger score " // trim(score_name) // & - " is not set for tally " // trim(to_str(tally_id))) + " is not set for tally " // trim(to_str(t % id))) end if ! Store the trigger convergence threshold @@ -2779,7 +2779,7 @@ contains t % triggers(trig_ind) % type = RELATIVE_ERROR case default call fatal_error("Unknown trigger type " // trim(temp_str) // & - " in tally " // trim(to_str(tally_id))) + " in tally " // trim(to_str(t % id))) end select ! Increment the overall trigger index @@ -2811,7 +2811,7 @@ contains ! tally needs post-collision information if (t % estimator == ESTIMATOR_ANALOG) then call fatal_error("Cannot use track-length estimator for tally " & - // to_str(tally_id)) + // to_str(t % id)) end if ! Set estimator to track-length estimator @@ -2822,7 +2822,7 @@ contains ! tally needs post-collision information if (t % estimator == ESTIMATOR_ANALOG) then call fatal_error("Cannot use collision estimator for tally " & - // to_str(tally_id)) + // to_str(t % id)) end if ! Set estimator to collision estimator diff --git a/src/tallies/tally_header.F90 b/src/tallies/tally_header.F90 index 967d00f575..b2e7f7ce53 100644 --- a/src/tallies/tally_header.F90 +++ b/src/tallies/tally_header.F90 @@ -274,6 +274,7 @@ contains end subroutine tally_allocate_results + function tally_set_filters(this, filter_indices) result(err) class(TallyObject), intent(inout) :: this integer(C_INT32_T), intent(in) :: filter_indices(:) @@ -634,6 +635,7 @@ contains end if end function openmc_tally_get_scores + function openmc_tally_get_type(index, type) result(err) bind(C) ! Return the type of a tally integer(C_INT32_T), value :: index @@ -715,7 +717,7 @@ contains case ('collision') tallies(index) % obj % estimator = ESTIMATOR_COLLISION case default - err = E_UNASSIGNED + err = E_INVALID_ARGUMENT call set_errmsg("Unknown tally estimator: " // trim(estimator_)) end select else