From 3fb2fc9880a95a8ef8ceff1d8c3cef56119c5976 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Mon, 16 Dec 2019 09:20:45 -0700 Subject: [PATCH 1/2] Updating to allow using the new IZA feature of NJOY2016. --- CMakeLists.txt | 118 +++++----- dependencies/ENDFtk | 2 +- dependencies/lipservice | 2 +- metaconfigure/description.json | 414 ++++++++++++++++----------------- src/njoy21/Version.hpp | 2 +- 5 files changed, 271 insertions(+), 267 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 80028c7d..8fdf38da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -105,18 +105,6 @@ set( njoy21_AppleClang_Darwin_link_time_optimization_flags "-flto" ) set( njoy21_AppleClang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) set( njoy21_AppleClang_Darwin_nonportable_optimization_flags "-march=native" ) set( njoy21_AppleClang_Darwin_static_flags "-static" ) -set( njoy21_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" ) -set( njoy21_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" ) -set( njoy21_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" ) -set( njoy21_GNU_Windows_strict_flags "-Werror" ) -set( njoy21_GNU_Windows_coverage_flags "--coverage" ) -set( njoy21_GNU_Windows_subproject_flags ) -set( njoy21_GNU_Windows_base_project_flags ) -set( njoy21_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" ) -set( njoy21_GNU_Windows_link_time_optimization_flags "-flto" ) -set( njoy21_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) -set( njoy21_GNU_Windows_nonportable_optimization_flags "-march=native" ) -set( njoy21_GNU_Windows_static_flags "-static" ) set( njoy21_GNU_Darwin_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" ) set( njoy21_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" ) set( njoy21_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" ) @@ -141,18 +129,18 @@ set( njoy21_GNU_Linux_link_time_optimization_flags "-flto" ) set( njoy21_GNU_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) set( njoy21_GNU_Linux_nonportable_optimization_flags "-march=native" ) set( njoy21_GNU_Linux_static_flags "-static" ) -set( njoy21_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" ) -set( njoy21_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" ) -set( njoy21_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" ) -set( njoy21_Clang_Windows_strict_flags "-Werror" ) -set( njoy21_Clang_Windows_coverage_flags "--coverage" ) -set( njoy21_Clang_Windows_subproject_flags ) -set( njoy21_Clang_Windows_base_project_flags ) -set( njoy21_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" ) -set( njoy21_Clang_Windows_link_time_optimization_flags "-flto" ) -set( njoy21_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) -set( njoy21_Clang_Windows_nonportable_optimization_flags "-march=native" ) -set( njoy21_Clang_Windows_static_flags "-static" ) +set( njoy21_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" ) +set( njoy21_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" ) +set( njoy21_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" ) +set( njoy21_GNU_Windows_strict_flags "-Werror" ) +set( njoy21_GNU_Windows_coverage_flags "--coverage" ) +set( njoy21_GNU_Windows_subproject_flags ) +set( njoy21_GNU_Windows_base_project_flags ) +set( njoy21_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" ) +set( njoy21_GNU_Windows_link_time_optimization_flags "-flto" ) +set( njoy21_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) +set( njoy21_GNU_Windows_nonportable_optimization_flags "-march=native" ) +set( njoy21_GNU_Windows_static_flags "-static" ) set( njoy21_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" ) set( njoy21_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" ) set( njoy21_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" ) @@ -177,6 +165,18 @@ set( njoy21_Clang_Linux_link_time_optimization_flags "-flto" ) set( njoy21_Clang_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) set( njoy21_Clang_Linux_nonportable_optimization_flags "-march=native" ) set( njoy21_Clang_Linux_static_flags "-static" ) +set( njoy21_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" ) +set( njoy21_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" ) +set( njoy21_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" ) +set( njoy21_Clang_Windows_strict_flags "-Werror" ) +set( njoy21_Clang_Windows_coverage_flags "--coverage" ) +set( njoy21_Clang_Windows_subproject_flags ) +set( njoy21_Clang_Windows_base_project_flags ) +set( njoy21_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" ) +set( njoy21_Clang_Windows_link_time_optimization_flags "-flto" ) +set( njoy21_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" ) +set( njoy21_Clang_Windows_nonportable_optimization_flags "-march=native" ) +set( njoy21_Clang_Windows_static_flags "-static" ) if ( static_njoy21 ) set( njoy21_library_linkage STATIC ) @@ -195,70 +195,74 @@ list( INSERT 0 CMAKE_INSTALL_RPATH "${rpath_prefix}/../lib" ) set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE ) get_directory_property( is_subproject PARENT_DIRECTORY ) -if( NOT TARGET fmt-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/fmt-adapter ) +if( NOT TARGET range-v3-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/range-v3-adapter ) endif() -if( NOT TARGET variant-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/variant-adapter ) +if( NOT TARGET catch-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/catch-adapter ) endif() -if( NOT TARGET spdlog-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/spdlog-adapter ) +if( NOT TARGET disco ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/disco ) endif() -if( NOT TARGET njoy ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy ) +if( NOT TARGET hana-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/hana-adapter ) endif() -if( NOT TARGET njoy_c_bindings ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy_c_bindings ) +if( NOT TARGET fmt-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/fmt-adapter ) endif() -if( NOT TARGET hana-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/hana-adapter ) +if( NOT TARGET spdlog-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/spdlog-adapter ) endif() -if( NOT TARGET tclap-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/tclap-adapter ) +if( NOT TARGET Log ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/Log ) endif() -if( NOT TARGET range-v3-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/range-v3-adapter ) +if( NOT TARGET header-utilities ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/header-utilities ) endif() -if( NOT TARGET catch-adapter ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/catch-adapter ) +if( NOT TARGET variant-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/variant-adapter ) endif() -if( NOT TARGET Log ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/Log ) +if( NOT TARGET ENDFtk ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/ENDFtk ) endif() -if( NOT TARGET dimwits ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/dimwits ) +if( NOT TARGET tclap-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/tclap-adapter ) endif() -if( NOT TARGET header-utilities ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/header-utilities ) +if( NOT TARGET njoy ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy ) endif() -if( NOT TARGET utility ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/utility ) +if( NOT TARGET njoy_c_bindings ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy_c_bindings ) endif() -if( NOT TARGET disco ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/disco ) +if( NOT TARGET json-adapter ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/json-adapter ) endif() -if( NOT TARGET ENDFtk ) - add_subdirectory( ${ROOT_DIRECTORY}/subprojects/ENDFtk ) +if( NOT TARGET utility ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/utility ) endif() if( NOT TARGET lipservice ) add_subdirectory( ${ROOT_DIRECTORY}/subprojects/lipservice ) endif() +if( NOT TARGET dimwits ) + add_subdirectory( ${ROOT_DIRECTORY}/subprojects/dimwits ) +endif() + if ( NOT GIT_EXECUTABLE ) find_package( Git ) @@ -342,7 +346,7 @@ ${CXX_appended_flags} ${njoy21_appended_flags} ) target_link_libraries( njoy21 PUBLIC "$<$,$>:${${PREFIX}_RELEASE_flags};${${PREFIX}_link_time_optimization_flags}$<$:${${PREFIX}_profile_generate_flags};>$<$:${${PREFIX}_profile_use_flags};>$<$:${${PREFIX}_nonportable_optimization_flags};>>$<$:$<$:${${PREFIX}_coverage_flags};>>$<$:${CXX_appended_flags};>$<$:${njoy21_appended_flags};>" ) -target_link_libraries( njoy21 PUBLIC njoy_c_bindings PUBLIC variant-adapter PUBLIC lipservice PUBLIC tclap-adapter PUBLIC ENDFtk PUBLIC dimwits PUBLIC utility ) +target_link_libraries( njoy21 PUBLIC ENDFtk PUBLIC tclap-adapter PUBLIC njoy_c_bindings PUBLIC variant-adapter PUBLIC lipservice PUBLIC dimwits PUBLIC utility ) if ( NOT is_subproject ) add_executable( njoy21_executable src/main.cpp ) @@ -369,10 +373,10 @@ endif() if( NOT is_subproject ) enable_testing() if ( unit_tests ) - add_subdirectory( src/njoy21/Driver/test ) - add_subdirectory( src/njoy21/legacy/Sequence/test ) add_subdirectory( src/njoy21/CommandLine/test ) + add_subdirectory( src/njoy21/Driver/test ) add_subdirectory( src/njoy21/io/Manager/test ) + add_subdirectory( src/njoy21/legacy/Sequence/test ) endif() add_subdirectory( tests ) endif() diff --git a/dependencies/ENDFtk b/dependencies/ENDFtk index b7648643..37698f7f 160000 --- a/dependencies/ENDFtk +++ b/dependencies/ENDFtk @@ -1 +1 @@ -Subproject commit b764864353ba308ae998113fde25086ee98324a5 +Subproject commit 37698f7f44363de67055cc46f6d3e84223fa697e diff --git a/dependencies/lipservice b/dependencies/lipservice index 478585ca..195c5783 160000 --- a/dependencies/lipservice +++ b/dependencies/lipservice @@ -1 +1 @@ -Subproject commit 478585ca6e3e6cff6cc29dbc4965ad83ddba290b +Subproject commit 195c5783d85df11af5dbd64459edd06eb8a4c090 diff --git a/metaconfigure/description.json b/metaconfigure/description.json index b5cf3a18..1a536a12 100644 --- a/metaconfigure/description.json +++ b/metaconfigure/description.json @@ -1,436 +1,436 @@ { "compiler": { "apple clang++": { - "minimum version": "8.0", + "minimum version": "8.0", "osx": { "flags": { - "base project": [], + "base project": [], "common": [ "-stdlib=libc++" - ], + ], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", + "-O0", + "-g", "-gdwarf-3" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", + "-Wall", + "-Wextra", "-Wpedantic" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } } - }, + }, "g++": { "linux": { "flags": { - "base project": [], + "base project": [], "common": [ "-Wno-subobject-linkage" - ], + ], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", - "-gdwarf-3", + "-O0", + "-g", + "-gdwarf-3", "-fsignaling-nans" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", - "-Wpedantic", + "-Wall", + "-Wextra", + "-Wpedantic", "-Wno-maybe-uninitialized" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } - }, - "minimum version": "6.2", + }, + "minimum version": "6.2", "osx": { "flags": { - "base project": [], - "common": [], + "base project": [], + "common": [], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", - "-gdwarf-3", + "-O0", + "-g", + "-gdwarf-3", "-fsignaling-nans" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", + "-Wall", + "-Wextra", "-Wpedantic" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } - }, + }, "windows": { "flags": { - "base project": [], - "common": [], + "base project": [], + "common": [], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", - "-gdwarf-3", + "-O0", + "-g", + "-gdwarf-3", "-fsignaling-nans" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", + "-Wall", + "-Wextra", "-Wpedantic" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } } - }, + }, "llvm clang++": { "linux": { "flags": { - "base project": [], + "base project": [], "common": [ "-stdlib=libstdc++" - ], + ], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", + "-O0", + "-g", "-gdwarf-3" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", + "-Wall", + "-Wextra", "-Wpedantic" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } - }, - "minimum version": "3.8", + }, + "minimum version": "3.8", "osx": { "flags": { - "base project": [], + "base project": [], "common": [ "-stdlib=libc++" - ], + ], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", + "-O0", + "-g", "-gdwarf-3" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", + "-Wall", + "-Wextra", "-Wpedantic" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } - }, + }, "windows": { "flags": { - "base project": [], + "base project": [], "common": [ "-stdlib=libc++" - ], + ], "coverage": [ "--coverage" - ], + ], "debug": [ - "-O0", - "-g", + "-O0", + "-g", "-gdwarf-3" - ], + ], "link time optimization": [ "-flto" - ], + ], "nonportable optimization": [ "-march=native" - ], + ], "optimization": [ - "-O3", + "-O3", "-DNDEBUG" - ], + ], "profile generate": [ "-fprofile-generate='{profile_path}'" - ], + ], "profile use": [ "-fprofile-use='{profile_path}'" - ], + ], "static": [ "-static" - ], + ], "strict": [ "-Werror" - ], - "subproject": [], + ], + "subproject": [], "warning": [ - "-Wall", - "-Wextra", + "-Wall", + "-Wextra", "-Wpedantic" ] - }, + }, "standard": { - "c++11": "-std=c++11", - "c++14": "-std=c++14", + "c++11": "-std=c++11", + "c++14": "-std=c++14", "c++98": "-std=c++98" } } } - }, + }, "configure files": [ "src/njoy21/Signature.hpp.in" - ], - "driver": "src/main.cpp", + ], + "driver": "src/main.cpp", "file extension": { "configure files": [ "in" - ], + ], "header files": [ - "h++", - "hxx", - "hpp", - "hh", + "h++", + "hxx", + "hpp", + "hh", "h" - ], + ], "implementation files": [ - "c++", - "cxx", - "cpp", + "c++", + "cxx", + "cpp", "cc" ] - }, + }, "header files": [ - "src/njoy21.hpp", - "src/njoy21/banner.hpp", - "src/njoy21/CommandLine.hpp", - "src/njoy21/Sequence.hpp", - "src/njoy21/interface.hpp", - "src/njoy21/io.hpp", - "src/njoy21/Driver.hpp", - "src/njoy21/Version.hpp", - "src/njoy21/legacy.hpp", - "src/njoy21/Driver/Factory.hpp", - "src/njoy21/Driver/Factory/src/setupLegacyDirectory.hpp", - "src/njoy21/Driver/Factory/src/setupManager.hpp", - "src/njoy21/Driver/Factory/src/callOperator.hpp", - "src/njoy21/Driver/src/callOperator.hpp", - "src/njoy21/io/Manager.hpp", - "src/njoy21/io/Manager/FileGuard.hpp", - "src/njoy21/io/Manager/Builder.hpp", - "src/njoy21/io/Manager/Builder/src/construct.hpp", - "src/njoy21/io/Manager/src/output.hpp", - "src/njoy21/legacy/Sequence.hpp", - "src/njoy21/legacy/Sequence/Factory.hpp", - "src/njoy21/legacy/Sequence/routines.hpp", + "src/njoy21.hpp", + "src/njoy21/banner.hpp", + "src/njoy21/CommandLine.hpp", + "src/njoy21/Sequence.hpp", + "src/njoy21/interface.hpp", + "src/njoy21/io.hpp", + "src/njoy21/Driver.hpp", + "src/njoy21/Version.hpp", + "src/njoy21/legacy.hpp", + "src/njoy21/Driver/Factory.hpp", + "src/njoy21/Driver/Factory/src/setupLegacyDirectory.hpp", + "src/njoy21/Driver/Factory/src/setupManager.hpp", + "src/njoy21/Driver/Factory/src/callOperator.hpp", + "src/njoy21/Driver/src/callOperator.hpp", + "src/njoy21/io/Manager.hpp", + "src/njoy21/io/Manager/FileGuard.hpp", + "src/njoy21/io/Manager/Builder.hpp", + "src/njoy21/io/Manager/Builder/src/construct.hpp", + "src/njoy21/io/Manager/src/output.hpp", + "src/njoy21/legacy/Sequence.hpp", + "src/njoy21/legacy/Sequence/Factory.hpp", + "src/njoy21/legacy/Sequence/routines.hpp", "src/njoy21/CommandLine/src/ctor.hpp" - ], - "ignore pattern": "$^", + ], + "ignore pattern": "$^", "implementation files": [ "src/main.cpp" - ], - "include path": "src", - "initialized": true, - "is external project": false, - "language": "c++", - "name": "njoy21", - "signature": true, - "standard": "c++14", + ], + "include path": "src", + "initialized": true, + "is external project": false, + "language": "c++", + "name": "njoy21", + "signature": true, + "standard": "c++14", "standards": [ - "c++98", - "c++11", + "c++98", + "c++11", "c++14" - ], - "strict": true, - "test pattern": "test$", + ], + "strict": true, + "test pattern": "test$", "tests": { "njoy21.CommandLine": [ "src/njoy21/CommandLine/test/CommandLine.test.cpp" - ], + ], "njoy21.Driver": [ "src/njoy21/Driver/test/Driver.test.cpp" - ], + ], "njoy21.io.Manager": [ "src/njoy21/io/Manager/test/Manager.test.cpp" - ], + ], "njoy21.legacy.Sequence": [ "src/njoy21/legacy/Sequence/test/Sequence.test.cpp" ] - }, + }, "update": true } \ No newline at end of file diff --git a/src/njoy21/Version.hpp b/src/njoy21/Version.hpp index dd0a2cd7..69faece8 100644 --- a/src/njoy21/Version.hpp +++ b/src/njoy21/Version.hpp @@ -4,7 +4,7 @@ class Version{ // Change whenever new capability is implemented static constexpr int minorVersion{0}; // Change whenever merge to master branch is done - static constexpr int patchVersion{5}; + static constexpr int patchVersion{6}; static std::string version(){ return std::to_string( majorVersion ) + "." + From 5c7eaf4777dc50fbaaef1d9f40c2b2c68cddb650 Mon Sep 17 00:00:00 2001 From: Jeremy Lloyd Conlin Date: Mon, 16 Dec 2019 09:28:05 -0700 Subject: [PATCH 2/2] Updating Release Notes. --- ReleaseNotes.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/ReleaseNotes.md b/ReleaseNotes.md index f583c62f..6569aa34 100644 --- a/ReleaseNotes.md +++ b/ReleaseNotes.md @@ -1,6 +1,15 @@ # Release Notes—NJOY21 Given here are some release notes for NJOY21. Each release is made through a formal [Pull Request](https://github.com/njoy/NJOY21/pulls) made on GitHub. There are links in this document that point to each of those Pull Requests, where you can see in great details the changes that were made. Often the Pull Requests are made in response to an [issue](https://github.com/njoy/NJOY21/issues). In such cases, links to those issues are also given. +## [NJOY21 1.0.5](https://github.com/njoy/NJOY21/pull/99) +This update adds to NJOY21 the NJOY2016 capability of >3 IZA values in ACER. This was added in NJOY2016 in [Pull Request #41](https://github.com/njoy/NJOY2016/pull/141). A few updates from lipservice are also included: + +- [Removal of dimwits units](https://github.com/njoy/lipservice/pull/10) +- [Adding NZA option to ACER](https://github.com/njoy/lipservice/pull/11), and +- [RECONR to JSON](https://github.com/njoy/lipservice/pull/12). + +All of these are included in the this version of NJOY21. + ## [NJOY21 1.0.4](https://github.com/njoy/NJOY21/pull/93) This version adds the capability to split the output into stderr and stdout. It is facilitated by and depends on [Pull Request#5](https://github.com/njoy/njoy_c_bindings/pull/5) from [njoy_c_bindings](https://github.com/njoy/njoy_c_bindings).