Skip to content

Merge development into pygriffin_initial

Kumar, Shikhar requested to merge pygriffin_development_merge into pygriffin_initial

@nstauff FYI, this MR merges development into pygriffin_initial. self.user_object.results["keff_griffin"] is used to store Griffin k-effective results. The following files still need merge conflicts resolved, and it should be confirmed that all unit tests still continue to pass

image

Edited by Kumar, Shikhar

Merge request reports