Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix for UWUW Macro Conflict #3150

Open
wants to merge 16 commits into
base: develop
Choose a base branch
from
Open

Fix for UWUW Macro Conflict #3150

wants to merge 16 commits into from
+37 −27

Commits on Sep 28, 2024

  1. Replace UWUW to UWUW_HPP

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Sep 28, 2024
    Configuration menu
    Copy the full SHA
    6e7df25 View commit details
    Browse the repository at this point in the history

Commits on Sep 29, 2024

  1. change UWUW_HPP to DAGMC_UWUW

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    c9413a4 View commit details
    Browse the repository at this point in the history

  2. reset to mat_str

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    f3fe37c View commit details
    Browse the repository at this point in the history

  3. uwuw_mat is not defined

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Sep 29, 2024
    Configuration menu
    Copy the full SHA
    58c7ffb View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. DAGMC_UWUW >> OPENMC_UWUW

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    f9a370c View commit details
    Browse the repository at this point in the history

  2. OPEMC_UWUW

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    482631b View commit details
    Browse the repository at this point in the history

  3. no need to find UWUW as it is a part of dagmc

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    1bb1f37 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'upstream/develop' into uwuw

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    afcc0af View commit details
    Browse the repository at this point in the history

  5. add FATAL_ERROR if DAGMC was not configured with UWUW

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Oct 3, 2024
    Configuration menu
    Copy the full SHA
    78306f1 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Display OpenMC version after install

    @pshriwise
    pshriwise committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    fd82f33 View commit details
    Browse the repository at this point in the history

  2. Move UWUW material definitions read into DAGUniverse::initialize method

    @pshriwise
    pshriwise committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    11075c6 View commit details
    Browse the repository at this point in the history

  3. Update cmake/OpenMCConfig.cmake.in 

    Co-authored-by: Patrick Shriwise <[email protected]>
    @ahnaf-tahmid-chowdhury @pshriwise
    ahnaf-tahmid-chowdhury and pshriwise authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    17e0b5a View commit details
    Browse the repository at this point in the history

  4. Update CMakeLists.txt 

    Co-authored-by: Patrick Shriwise <[email protected]>
    @ahnaf-tahmid-chowdhury @pshriwise
    ahnaf-tahmid-chowdhury and pshriwise authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    8ebabd8 View commit details
    Browse the repository at this point in the history

  5. OPENMC_USE_UWUW OFF

    @ahnaf-tahmid-chowdhury
    ahnaf-tahmid-chowdhury committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    3a88e14 View commit details
    Browse the repository at this point in the history

Commits on Oct 5, 2024

  1. Update error message for clarity.

    @pshriwise
    pshriwise committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    219fff7 View commit details
    Browse the repository at this point in the history

  2. Updating message about UWUW to make it clear it's related to the Open… 

    …MC configuration
    @pshriwise
    pshriwise committed Oct 5, 2024
    Configuration menu
    Copy the full SHA
    7295c3b View commit details
    Browse the repository at this point in the history