Merge pull request #99 from njoy/feature/IZA

Updating to allow using the new IZA feature of NJOY2016.

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 "$<$<AND:$<CONFIG:RELEASE>,$<BOOL:${link_time_optimization}>>:${${PREFIX}_RELEASE_flags};${${PREFIX}_link_time_optimization_flags}$<$<BOOL:${profile_generate}>:${${PREFIX}_profile_generate_flags};>$<$<BOOL:${profile_use}>:${${PREFIX}_profile_use_flags};>$<$<BOOL:${nonportable_optimization}>:${${PREFIX}_nonportable_optimization_flags};>>$<$<CONFIG:DEBUG>:$<$<BOOL:${coverage}>:${${PREFIX}_coverage_flags};>>$<$<BOOL:CXX_appended_flags>:${CXX_appended_flags};>$<$<BOOL:njoy21_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()

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).