Fix COLDH

.travis.yml

@@ -22,7 +22,7 @@ before_install:
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update; fi
 - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew install gcc; fi
 
-script: "travis_wait 30 ./.travis/build.sh"
+script: "travis_wait 40 ./.travis/build.sh"
 after_success: "./.travis/signature.sh"
 
 env:

.travis/build.sh

@@ -37,6 +37,7 @@ then
 fi
 if [ "$build_type" = "coverage" ]
 then
+  pip install --upgrade pip
   pip install --user cpp-coveralls
   echo "loading coverage information"
   coveralls  --exclude-pattern "/usr/include/.*|.*/CMakeFiles/.*|.*subprojects.*|.*dependencies.*|.*test\.cpp" --root ".." --build-root "." --gcov-options '\-lp'

.travis/signature.sh

@@ -1,10 +1,10 @@
 #! /bin/bash
 
-echo "TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
-echo "TRAVIS_BRANCH: $TRAVIS_BRANCH"
-if [ "$TRAVIS_PULL_REQUEST" = false ] && [ "$TRAVIS_BRANCH" = "master" ]; then
-  git config --global user.email "[email protected]"
-  git config --global user.name "Travis CI"
+if [ "$TRAVIS_PULL_REQUEST" = false ] && 
+   [ "$TRAVIS_BRANCH" = "master" ] &&
+   [ "$build_type" = "coverage" ]; then
+  git config --global user.email "[email protected]"
+  git config --global user.name "Jeremy Lloyd Conlin"
 
   timestamp=`date +%F_%T`
 

Dockerfile

@@ -0,0 +1,10 @@
+FROM debian:latest
+
+RUN apt update && apt upgrade -y && \
+    apt install gfortran cmake python3 git -y && \
+    git clone https://github.com/njoy/NJOY2016.git &&\
+    cd NJOY2016 && mkdir build && cd build &&\
+    cmake .. && \
+    make
+
+ENTRYPOINT [ "/bin/bash" ]

appveyor.yml

@@ -0,0 +1,78 @@
+image:
+  - "Visual Studio 2017"
+
+shallow_clone: false
+
+environment:
+  MINGW_DIR: C:\msys64\mingw64\bin
+  Path: C:\Python34-x64\;%MINGW_DIR%;%Path%
+  matrix:
+    -
+      CMAKE_BUILD: cygwin
+      STATIC_LIBS: true
+      CYGWIN_NOWINPATH: yes
+      clone_folder: "C:\\cygwin\\projects\\NJOY2016"
+      CYG_BASH: C:\cygwin\bin\bash
+      CYG_CACHE: C:\cygwin\var\cache\setup
+      CYG_MIRROR: http://cygwin.mirror.constant.com
+      CYG_ROOT: C:\cygwin
+      CC: /usr/bin/gcc
+      CXX: /usr/bin/g++
+      FC: /usr/bin/gfortran
+    -
+      CMAKE_BUILD: MSYS
+      STATIC_LIBS: true
+      clone_folder: "C:\\projects\\NJOY2016"
+      CC: "%MINGW_DIR%\\gcc.exe"
+      CXX: "%MINGW_DIR%\\g++.exe"
+      FC: "%MINGW_DIR%\\gfortran.exe"
+      TMP_PATH: "C:\\Program Files (x86)\\CMake\\bin;C:\\Python34-x64;%MINGW_DIR%;C:\\Program Files\\Git\\cmd;C:\\msys64;C:\\Program Files\\Git\\usr\\bin"
+    -
+      CMAKE_BUILD: MSYS
+      STATIC_LIBS: false
+      clone_folder: "C:\\projects\\NJOY2016"
+      CC: "%MINGW_DIR%\\gcc.exe"
+      CXX: "%MINGW_DIR%\\g++.exe"
+      FC: "%MINGW_DIR%\\gfortran.exe"
+      TMP_PATH: "C:\\Program Files (x86)\\CMake\\bin;C:\\Python34-x64;%MINGW_DIR%;C:\\Program Files\\Git\\cmd;C:\\msys64;C:\\Program Files\\Git\\usr\\bin"
+    -
+      CMAKE_BUILD: MinGW
+      STATIC_LIBS: true
+      clone_folder: "C:\\projects\\NJOY2016"
+      CC: "%MINGW_DIR%\\gcc.exe"
+      CXX: "%MINGW_DIR%\\g++.exe"
+      FC: "%MINGW_DIR%\\gfortran.exe"
+      TMP_PATH: "C:\\Program Files (x86)\\CMake\\bin;C:\\Python34-x64;%MINGW_DIR%;C:\\Program Files\\Git\\cmd;C:\\msys64;C:\\Program Files\\Git\\usr\\bin"
+    -
+      CMAKE_BUILD: MinGW
+      STATIC_LIBS: false
+      clone_folder: "C:\\projects\\NJOY2016"
+      CC: "%MINGW_DIR%\\gcc.exe"
+      CXX: "%MINGW_DIR%\\g++.exe"
+      FC: "%MINGW_DIR%\\gfortran.exe"
+      TMP_PATH: "C:\\Program Files (x86)\\CMake\\bin;C:\\Python34-x64;%MINGW_DIR%;C:\\Program Files\\Git\\cmd;C:\\msys64;C:\\Program Files\\Git\\usr\\bin"
+
+init:
+  - if [%CMAKE_BUILD%]==[cygwin] git config --global core.autocrlf input
+
+install:
+  - if [%CMAKE_BUILD%]==[cygwin] C:\cygwin\setup-x86.exe -q --root %CYG_ROOT% --local-package-dir %CYG_CACHE% --packages cmake,make,git,python3,gcc-core,gcc-g++,gcc-fortran --force-current --no-shortcuts --no-startmenu --no-desktop
+
+before_build:
+  - if not [%CMAKE_BUILD%]==[cygwin] set OrigPath=%Path%
+  - if [%CMAKE_BUILD%]==[cygwin] set Path=C:\cygwin\bin
+
+build_script:
+  - mkdir build
+  - cd build
+  - if [%CMAKE_BUILD%]==[cygwin] %CYG_BASH% -c "/usr/bin/cmake -D static=%STATIC_LIBS% -G \"Unix Makefiles\" .."
+  - if [%CMAKE_BUILD%]==[cygwin] %CYG_BASH% -c "/usr/bin/make -j2"
+# Non-cygwin builds
+  - if not [%CMAKE_BUILD%]==[cygwin] set Path=%TMP_PATH%
+  - if not [%CMAKE_BUILD%]==[cygwin] cmake -D CMAKE_Fortran_COMPILER=C:/msys64/mingw64/bin/gfortran.exe -D CMAKE_MAKE_PROGRAM=C:/msys64/mingw64/bin/mingw32-make.exe -D static=%STATIC_LIBS% -G "%CMAKE_BUILD% Makefiles" ..
+  - if not [%CMAKE_BUILD%]==[cygwin] set Path=%OrigPath%
+  - if not [%CMAKE_BUILD%]==[cygwin] mingw32-make -j2
+
+after_build:
+  - if [%CMAKE_BUILD%]==[cygwin] %CYG_BASH% -c "ctest -j2 --output-on-failure"
+  - if not [%CMAKE_BUILD%]==[cygwin] ctest -j2 --output-on-failure

docs/testDescription.md

@@ -128,3 +128,39 @@ title: NJOY2016 Test Descriptions
 
   This test case was developed to check if NaNs were "calculated" in `PURR`. This problem was discovered by Dave Brown and Paul Romano and was fixed in [Pull Request 18](https://github.com/njoy/NJOY2016/pull/18). This test was created in an attempt to prevent this from happening again. (No guarantees.)
 
+## Test Problem 22
+
+[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/22/input)]
+
+  This test is the LEAPR input for para H2 at 20 K from ENDF/B-VIII.0-beta4. The test checks the compatibility between the skold and coldh subroutines.
+
+## Test Problem 23
+
+[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/23/input)]
+
+  This test is the LEAPR input for BeO from ENDF/B-VI.8. The test checks the ability to process materials with secondary scatterers.
+
+## Test Problem 24
+
+[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/24/input)]
+
+  This test is essentially a standard NJOY input file for producing a continuous energy ACE file for Pu239 (it should be noted that `UNRESR` and `PURR` are omitted from this input file due to runtime constraints). The Pu239 evaluation associated to this test contains tabulated fission energy components in MF1 MT458 (a new format made available for ENDF/B-VIII.0). This test was designed to test this new feature in `HEATR`. This test also runs a double heatr run to detect the issue of reallocating arrays in a double heatr run encountered with NJOY 2016.21.
+
+## Test Problem 25
+
+[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/25/input)]
+
+  This test is essentially a standard NJOY input file for producing continuous energy thermal scattering ACE files for H in H2O. This test produces three ACE files, one for each iwt option value in `ACER`. This test is made in preparation of a fix proposed by D. Roubtsov to solve issues with cosines outside the [-1,1] range produced by `ACER` for thermal scattering files.
+
+## Test Problem 26
+
+[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/26/input)]
+
+  This test is used to check heatr results using an ENDF file without an MT458 section (fission energy release components) in MF1. This test was added in response to an issue introduced in NJOY 2016.21 involving such ENDF files.
+
+## Test Problem 27
+
+[[input](https://raw.githubusercontent.com/njoy/NJOY2016/master/test/27/input)]
+
+  This test is used to complete testing for the `ERRORR` module when processing MF35 covariances. Test 18 already has a test for this, but it uses an evaluation with a single covariance energy range (between 0 and 20 MeV). This test uses a Pu239 evaluation in which MF35 is composed of multiple covariance ranges. `ERRORR` is called twice in this run, once for the second range (between 5 and 6.5 MeV) and a second time using the -1 option with an efmean equal to 5.75 MeV (which should also be the second range). Both `ERRORR` runs should give the same results.
+

metaconfigure/fetch_subprojects.py

@@ -30,8 +30,8 @@ def clone_submodule( relative_path ):
       ----------------------------------------
       """.format( relative_path = relative_path ) ) )
     invocation = [ "git", "submodule", "update", "-q","--init", "--", relative_path ]
-    if os.name == "nt":
-        invocation.insert( 0, "powershell" )
+#    if os.name == "nt":
+#        invocation.insert( 0, "powershell" )
 
     clone = subprocess.Popen( invocation )
     clone.communicate()
@@ -46,8 +46,8 @@ def update_repository( git ):
     else:
         print("Checking out revision {}...\n".format( git[ project_name() ] ) )
         invocation = ["git", "pull", "-q", "origin", git[ project_name() ] ]
-    if os.name == "nt":
-        invocation.insert( 0, "powershell" )
+#    if os.name == "nt":
+#        invocation.insert( 0, "powershell" )
     update = subprocess.Popen( invocation )
     update.communicate()