updating from upstream

.github/ISSUE_TEMPLATE/defect-report.yml

@@ -0,0 +1,97 @@
+name: Defect Report
+description: Report a DEFECT you experienced using the code
+title: "[DEFECT] "
+labels: defect, priority_normal
+body:
+  - type: checkboxes
+    id: requirements
+    attributes:
+      label: Thank you for the defect report
+      description: Please check the suggestions below before proceeding
+      options:
+        - label: I am using the latest version of `RAVEN`.
+          required: true
+        - label: I have read the [Wiki](https://github.com/idaholab/raven/wiki).
+          required: true
+        - label: |
+            I have created a [minimum, reproducible example](https://stackoverflow.com/help/minimal-reproducible-example)
+            that demonstrates the defect.
+  - type: textarea
+    id: defect-description
+    attributes:
+      label: Defect Description
+      description: A clear and concise description of what the defect is.
+    validations:
+      required: true
+  - type: textarea
+    id: steps-to-reproduce
+    attributes:
+      label: Steps to Reproduce
+      description: Describe how to reproduce the defect.
+    validations:
+      required: true
+  - type: textarea
+    id: expected-behavior
+    attributes:
+      label: Expected Behavior
+      description: A clear and concise description of what you expected to happen.
+    validations:
+      required: true
+  - type: textarea
+    id: additional-info
+    attributes:
+      label: Screenshots and Input Files
+      description: Please attach any additional information like input files, screenshots, recordings and logs, etc.
+    validations:
+      required: false
+  - type: dropdown
+    id: which-os
+    attributes:
+      label: OS
+      description: Which OS are you using?
+      options:
+        - Linux
+        - MacOS
+        - Windows
+    validations:
+      required: true
+  - type: input
+    id: which-version
+    attributes:
+      label: OS Version
+      description: Which OS version are you using?
+      placeholder: "10.15.5"
+    validations:
+      required: false
+  - type: dropdown
+    id: which-package-manager
+    attributes:
+      label: Dependency Manager
+      description: Which Dependency Manager are you using?
+      options:
+        - PIP
+        - CONDA
+    validations:
+      required: true
+  - type: checkboxes
+    id: issue-review
+    attributes:
+      label: "For Change Control Board: Issue Review"
+      description: "This review should occur before any development is performed as a response to this issue."
+      options:
+        - label: "Is it tagged with a type: defect or task?"
+        - label: "Is it tagged with a priority: critical, normal or minor?"
+        - label: "If it will impact requirements or requirements tests, is it tagged with requirements?"
+        - label: "If it is a defect, can it cause wrong results for users? If so an email needs to be sent to the users."
+        - label: "Is a rationale provided? (Such as explaining why the improvement is needed or why current code is wrong.)"
+  - type: checkboxes
+    id: issue-closure
+    attributes:
+      label: "For Change Control Board: Issue Closure"
+      description: "This review should occur when the issue is imminently going to be closed."
+      options:
+        - label: "If the issue is a defect, is the defect fixed?"
+        - label: "If the issue is a defect, is the defect tested for in the regression test system?  (If not explain why not.)"
+        - label: "If the issue can impact users, has an email to the users group been written (the email should specify if the defect impacts stable or master)?"
+        - label: "If the issue is a defect, does it impact the latest release branch? If yes, is there any issue tagged with release (create if needed)?"
+        - label: "If the issue is being closed without a pull request, has an explanation of why it is being closed been provided?"

.github/ISSUE_TEMPLATE/feature_request.md

@@ -3,7 +3,7 @@ name: Feature request
 about: Suggest a new capability or addition you would like to see
 title: "[TASK] Title here"
 labels: priority_minor, task
-assignees: PaulTalbot-INL, joshua-cogliati-inl, wangcj05, mandd
+assignees:
 
 
 ---

.github/ISSUE_TEMPLATE/under-discussion.md

@@ -4,7 +4,7 @@ about: This issue template is aimed to propose an item of discussion for new fea
   or similar
 title: "[UNDER-DISCUSSION] New Topic"
 labels: under-discussion
-assignees: PaulTalbot-INL, joshua-cogliati-inl, wangcj05, mandd
+assignees:
 
 
 ---

.gitignore

@@ -1,67 +1,39 @@
+.failed_tests
 .libs
+.ravenrc
+*-dbg
+*-devel
+*-oprof
+*-opt
+*.a
+*.csv
+*.ctf
+*.d
 *.dylib
+*.e
 *.la
 *.lo
-*.d
 *.o
-*.a
-*-opt
-*-dbg
-*-oprof
-*-devel
-*.e
-*.csv
+*.ravencntr
+*.ravenStatus
 *.so
 *~
-*.ctf
-tests/core_example/PWR_CoreChannel_controlled_var_restart_test_out_restart_0020.ravenaux
-tests/core_example/PWR_CoreChannel_controlled_var_test_out_restart_0020.ravenaux
-*.ravencntr
-control_modules/distribution1D.py
-control_modules/distribution1D_wrap.cxx
-control_modules/raventools.py
-control_modules/raventools_wrap.cxx
-control_modules/libdistribution1D.so*
-control_modules/libdistribution1D.so*
-control_modules/libraventools.so*
-control_modules/libraventools.so*
+build_out*
+build/
+install/
 libRAVEN*.so*
-RAVEN-devel
-tests/framework/DataBaseStorage/
-tests/framework/GridTestBison/CustomSampler/
-tests/framework/GridTestRaven/FirstMRun/
-tests/framework/LHStestBison/myLHS/
-tests/framework/LHStestRaven/FirstMRun/
-tests/framework/MCTestBison/CustomSampler/
-tests/framework/MCTestBison/CustomSampler_noalias/
-tests/framework/branch/DETrunTest/
-tests/framework/SBO_DET/DET/
-tests/framework/mode_test/FirstMRun/
-tests/framework/output_check/*.png
-tests/framework/output_check/FirstMRun/
-tests/framework/revirD_tset/FirstMRun/
-tests/framework/test_extract_data_s_from_hdf5/MonteCarlo/
-tests/framework/test_rom_trainer/MC_for_rom_trainer/
-tests/framework/mpi_driver_test/FirstMRun/
-tests/framework/CodeInterfaceTests/MelcorInterface/testMelcor/*
-tests/framework/CodeInterfaceTests/RELAP5interfaceTestSingleRun/*
-work_in_progress/remote_tools/remote_tools
-work_in_progress/remote_tools/remote_tools.py
-work_in_progress/remote_tools/remote_tools_wrap.cxx
-work_in_progress/remote_tools/time
-framework/DatabaseStorage/
-tests/framework/LHStestFerret/myLHS/
-tests/framework/PreconditionedDynamicEventTree/PreconditionedDETrunTest/
-tests/framework/CUBIT_MOOSE_test/grid_run/
-tests/framework/BISON_and_MESH_test/grid_run/
-tests/framework/RedundantInputs/sim_py_MC/
-tests/framework/RedundantInputs/sim_py_grid/
-tests/plugins
 plugins/ExamplePlugin/doc/version.tex
-build/
-.failed_tests
-.ravenrc
-*.ravenStatus
+raven_cxx.egg-info/
+raven_framework.egg-info/
+raven_framework*.whl
+src/contrib/amsc.egg-info/
+src/crow_modules/distribution1D_wrap.cpp
+src/crow_modules/distribution1D.py
+src/crow_modules/interpolationND_wrap.cpp
+src/crow_modules/interpolationND.py
+src/crow_modules/randomENG_wrap.cpp
+src/crow_modules/randomENG.py
+test_out*
 
 # eclipse
 .project

README.md

@@ -116,7 +116,7 @@ This project is supported by [Idaho National Laboratory](https://www.inl.gov/).
 
 ### License
 
-Files in /crow/contrib and /framework/contrib are third party libraries that are not part of Raven and are provided here for covenience. These are under their own, seperate licensing which is described in those directories.
+Files in crow/contrib, src/contrib and framework/contrib are third party libraries that are not part of Raven and are provided here for covenience. These are under their own, seperate licensing which is described in those directories.
 
 Raven itself is licensed as follows:
 

build_raven

@@ -7,6 +7,8 @@ RAVEN_BUILD_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 # source read ravenrc script
 RAVEN_RC_SCRIPT=$RAVEN_BUILD_DIR/scripts/read_ravenrc.sh
 RAVEN_RC_SCRIPT="${RAVEN_RC_SCRIPT//\\//}"
+PYTHON_FMU_DIR="$RAVEN_BUILD_DIR/ravenframework/contrib/PythonFMU"
+PYTHON_FMU_DIR="${PYTHON_FMU_DIR//\\//}"
 source $RAVEN_RC_SCRIPT
 
 echo Making RAVEN ...
@@ -19,8 +21,8 @@ LIBS_MODE=0 # 0 is "create", 1 is "load"
 ECE_ARGS=" "
 
 # check installation manager in ravenrc if present
-INSTALLATION_MANAGER=$(read_ravenrc "INSTALLATION_MANAGER")
-if [[ "$INSTALLATION_MANAGER" == "PIP" ]];
+export RAVEN_INSTALLATION_MANAGER=$(read_ravenrc "INSTALLATION_MANAGER")
+if [[ "$RAVEN_INSTALLATION_MANAGER" == "PIP" ]];
   then
   LIBS_MODE=2
 else
@@ -102,9 +104,14 @@ if test `uname` = Darwin; then
     export MACOSX_DEPLOYMENT_TARGET;
 fi
 
-(cd $CROW_DIR && ${PYTHON_COMMAND} ./setup.py build_ext build install --install-platlib=./install)
+PIP_COMMAND=pip3
+(cd $RAVEN_BUILD_DIR && ${PIP_COMMAND} --verbose install . --upgrade --target ./install)
 
-(cd $RAVEN_BUILD_DIR && ${PYTHON_COMMAND} ./setup.py build_ext build install --install-platlib=./framework/contrib/AMSC)
+#pip install will add a duplicate ravenframework directory, so delete so there isn't
+# confusion over which of the two copies to use.
+(cd $RAVEN_BUILD_DIR && rm -Rf install/ravenframework)
+
+(cd $PYTHON_FMU_DIR && ./build_pythonfmu || echo PythonFMU build failed)
 
 if [ ! -z "$RAVEN_SIGNATURE" ];
 then
@@ -114,8 +121,8 @@ then
     # https://developer.apple.com/library/archive/documentation/Security/Conceptual/CodeSigningGuide/Procedures/Procedures.html
     # RAVEN_SIGNATURE can be added to .ravenrc
     echo "... Signing code with '$RAVEN_SIGNATURE' ..."
-    (cd $CROW_DIR/install/crow_modules && pwd && codesign -s "$RAVEN_SIGNATURE" -v *.so)
-    (cd $RAVEN_BUILD_DIR/framework/contrib/AMSC && pwd && codesign -s "$RAVEN_SIGNATURE" -v *.so)
+    (cd $RAVEN_BUILD_DIR/install/crow_modules && pwd && codesign -s "$RAVEN_SIGNATURE" -v *.so)
+    (cd $RAVEN_BUILD_DIR/install/AMSC && pwd && codesign -s "$RAVEN_SIGNATURE" -v *.so)
 fi
 
 echo ... done!

check_py_coverage.sh

@@ -36,8 +36,8 @@ else
     cd $BUILD_DIR
     #SHA256=56e448f051a201c5ebbaa86a5efd0ca90d327204d8b059ab25ad0f35fbfd79f1
     $DOWNLOADER https://files.pythonhosted.org/packages/35/fe/e7df7289d717426093c68d156e0fd9117c8f4872b6588e8a8928a0f68424/coverage-4.5.1.tar.gz
-    tar -xvzf coverage-3.7.1.tar.gz
-    cd coverage-3.7.1
+    tar -xvzf coverage-4.5.1.tar.gz
+    cd coverage-4.5.1
     (unset CC CXX; $PYTHON_CMD setup.py install --prefix=$INSTALL_DIR)
 fi
 
@@ -46,7 +46,7 @@ update_python_path
 cd $SCRIPT_DIR
 
 #coverage help run
-FRAMEWORK_DIR=`(cd framework && pwd)`
+FRAMEWORK_DIR=`(cd ravenframework && pwd)`
 
 source $SCRIPT_DIR/scripts/establish_conda_env.sh --quiet --load
 # get display var

clean_raven

@@ -3,27 +3,28 @@
 RAVEN_DIR="$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 CROW_DIR=${RAVEN_DIR}/crow
 
-rm -f ${RAVEN_DIR}/framework/contrib/AMSC/_amsc*.so \
-    ${RAVEN_DIR}/framework/contrib/AMSC/amsc*egg-info \
-    ${RAVEN_DIR}/framework/contrib/AMSC/amsc.py \
-    ${RAVEN_DIR}/framework/contrib/AMSC/amsc.pyc \
+rm -f ${RAVEN_DIR}/ravenframework/contrib/AMSC/_amsc*.so \
+    ${RAVEN_DIR}/ravenframework/contrib/AMSC/amsc*egg-info \
+    ${RAVEN_DIR}/ravenframework/contrib/AMSC/amsc.py \
+    ${RAVEN_DIR}/ravenframework/contrib/AMSC/amsc.pyc \
     ${RAVEN_DIR}/src/contrib/amsc_wrap.cxx \
     ${RAVEN_DIR}/src/contrib/amsc_wrap.cpp \
     ${RAVEN_DIR}/src/contrib/amsc.py \
-    ${RAVEN_DIR}/src/contrib/amsc.pyc \
-    ${RAVE_DIR}/cow/install/
-rm -Rf ${RAVEN_DIR}/build
-find ${RAVEN_DIR}/framework  -name '*.pyc' -exec rm '{}' \;
+    ${RAVEN_DIR}/src/contrib/amsc.pyc
+rm -Rf ${RAVEN_DIR}/build  \
+   ${RAVEN_DIR}/crow/install/ \
+   ${RAVEN_DIR}/install/
+find ${RAVEN_DIR}/ravenframework  -name '*.pyc' -exec rm '{}' \;
 find ${RAVEN_DIR}/scripts  -name '*.pyc' -exec rm '{}' \;
 find ${RAVEN_DIR}/rook  -name '*.pyc' -exec rm '{}' \;
 find ${RAVEN_DIR}/tests  -name '*.pyc' -exec rm '{}' \;
 find ${RAVEN_DIR}/plugins  -name '*.pyc' -exec rm '{}' \;
-find ${RAVEN_DIR}/framework  -name '*.pyo' -exec rm '{}' \;
+find ${RAVEN_DIR}/ravenframework  -name '*.pyo' -exec rm '{}' \;
 find ${RAVEN_DIR}/scripts  -name '*.pyo' -exec rm '{}' \;
 find ${RAVEN_DIR}/rook  -name '*.pyo' -exec rm '{}' \;
 find ${RAVEN_DIR}/tests  -name '*.pyo' -exec rm '{}' \;
 find ${RAVEN_DIR}/plugins  -name '*.pyo' -exec rm '{}' \;
-find ${RAVEN_DIR}/framework  -name '__pycache__' -exec rm -Rf '{}' \;
+find ${RAVEN_DIR}/ravenframework  -name '__pycache__' -exec rm -Rf '{}' \;
 find ${RAVEN_DIR}/scripts  -name '__pycache__' -exec rm -Rf '{}' \;
 find ${RAVEN_DIR}/rook  -name '__pycache__' -exec rm -Rf '{}' \;
 find ${RAVEN_DIR}/tests  -name '__pycache__' -exec rm -Rf '{}' \;

crow/.gitignore

@@ -45,3 +45,10 @@ crow_modules/interpolationNDpy3_wrap.cpp
 crow_modules/randomENGpy3_wrap.cpp
 build/
 install/
+crow.egg-info/
+crow_modules/distribution1D.py
+crow_modules/distribution1D_wrap.cpp
+crow_modules/interpolationND.py
+crow_modules/interpolationND_wrap.cpp
+crow_modules/randomENG.py
+crow_modules/randomENG_wrap.cpp