Skip to content

Commit 10acdd2

Browse files
jlconlinjlconlin
authored
Merge pull request #99 from njoy/feature/IZA
Updating to allow using the new IZA feature of NJOY2016.
2 parents 47495ce + 5c7eaf4 commit 10acdd2

File tree

6 files changed

+280
-267
lines changed

6 files changed

+280
-267
lines changed

‎CMakeLists.txt

+61-57
Original file line numberDiff line numberDiff line change
@@ -105,18 +105,6 @@ set( njoy21_AppleClang_Darwin_link_time_optimization_flags "-flto" )
105105
set( njoy21_AppleClang_Darwin_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
106106
set( njoy21_AppleClang_Darwin_nonportable_optimization_flags "-march=native" )
107107
set( njoy21_AppleClang_Darwin_static_flags "-static" )
108-
set( njoy21_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
109-
set( njoy21_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
110-
set( njoy21_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
111-
set( njoy21_GNU_Windows_strict_flags "-Werror" )
112-
set( njoy21_GNU_Windows_coverage_flags "--coverage" )
113-
set( njoy21_GNU_Windows_subproject_flags )
114-
set( njoy21_GNU_Windows_base_project_flags )
115-
set( njoy21_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
116-
set( njoy21_GNU_Windows_link_time_optimization_flags "-flto" )
117-
set( njoy21_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
118-
set( njoy21_GNU_Windows_nonportable_optimization_flags "-march=native" )
119-
set( njoy21_GNU_Windows_static_flags "-static" )
120108
set( njoy21_GNU_Darwin_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
121109
set( njoy21_GNU_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
122110
set( njoy21_GNU_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
@@ -141,18 +129,18 @@ set( njoy21_GNU_Linux_link_time_optimization_flags "-flto" )
141129
set( njoy21_GNU_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
142130
set( njoy21_GNU_Linux_nonportable_optimization_flags "-march=native" )
143131
set( njoy21_GNU_Linux_static_flags "-static" )
144-
set( njoy21_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
145-
set( njoy21_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
146-
set( njoy21_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
147-
set( njoy21_Clang_Windows_strict_flags "-Werror" )
148-
set( njoy21_Clang_Windows_coverage_flags "--coverage" )
149-
set( njoy21_Clang_Windows_subproject_flags )
150-
set( njoy21_Clang_Windows_base_project_flags )
151-
set( njoy21_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
152-
set( njoy21_Clang_Windows_link_time_optimization_flags "-flto" )
153-
set( njoy21_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
154-
set( njoy21_Clang_Windows_nonportable_optimization_flags "-march=native" )
155-
set( njoy21_Clang_Windows_static_flags "-static" )
132+
set( njoy21_GNU_Windows_common_flags "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
133+
set( njoy21_GNU_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" "-fsignaling-nans" )
134+
set( njoy21_GNU_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
135+
set( njoy21_GNU_Windows_strict_flags "-Werror" )
136+
set( njoy21_GNU_Windows_coverage_flags "--coverage" )
137+
set( njoy21_GNU_Windows_subproject_flags )
138+
set( njoy21_GNU_Windows_base_project_flags )
139+
set( njoy21_GNU_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
140+
set( njoy21_GNU_Windows_link_time_optimization_flags "-flto" )
141+
set( njoy21_GNU_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
142+
set( njoy21_GNU_Windows_nonportable_optimization_flags "-march=native" )
143+
set( njoy21_GNU_Windows_static_flags "-static" )
156144
set( njoy21_Clang_Darwin_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
157145
set( njoy21_Clang_Darwin_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
158146
set( njoy21_Clang_Darwin_RELEASE_flags "-O3" "-DNDEBUG" )
@@ -177,6 +165,18 @@ set( njoy21_Clang_Linux_link_time_optimization_flags "-flto" )
177165
set( njoy21_Clang_Linux_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
178166
set( njoy21_Clang_Linux_nonportable_optimization_flags "-march=native" )
179167
set( njoy21_Clang_Linux_static_flags "-static" )
168+
set( njoy21_Clang_Windows_common_flags "-stdlib=libc++" "-Wall" "-Wextra" "-Wpedantic" "-std=c++14" )
169+
set( njoy21_Clang_Windows_DEBUG_flags "-O0" "-g" "-gdwarf-3" )
170+
set( njoy21_Clang_Windows_RELEASE_flags "-O3" "-DNDEBUG" )
171+
set( njoy21_Clang_Windows_strict_flags "-Werror" )
172+
set( njoy21_Clang_Windows_coverage_flags "--coverage" )
173+
set( njoy21_Clang_Windows_subproject_flags )
174+
set( njoy21_Clang_Windows_base_project_flags )
175+
set( njoy21_Clang_Windows_profile_generate_flags "-fprofile-generate='${CMAKE_BINARY_DIR}/profiling'" )
176+
set( njoy21_Clang_Windows_link_time_optimization_flags "-flto" )
177+
set( njoy21_Clang_Windows_profile_use_flags "-fprofile-use='${CMAKE_BINARY_DIR}/profiling'" )
178+
set( njoy21_Clang_Windows_nonportable_optimization_flags "-march=native" )
179+
set( njoy21_Clang_Windows_static_flags "-static" )
180180

181181
if ( static_njoy21 )
182182
set( njoy21_library_linkage STATIC )
@@ -195,70 +195,74 @@ list( INSERT 0 CMAKE_INSTALL_RPATH "${rpath_prefix}/../lib" )
195195
set( CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE )
196196
get_directory_property( is_subproject PARENT_DIRECTORY )
197197

198-
if( NOT TARGET fmt-adapter )
199-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/fmt-adapter )
198+
if( NOT TARGET range-v3-adapter )
199+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/range-v3-adapter )
200200
endif()
201201

202-
if( NOT TARGET variant-adapter )
203-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/variant-adapter )
202+
if( NOT TARGET catch-adapter )
203+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/catch-adapter )
204204
endif()
205205

206-
if( NOT TARGET spdlog-adapter )
207-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/spdlog-adapter )
206+
if( NOT TARGET disco )
207+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/disco )
208208
endif()
209209

210-
if( NOT TARGET njoy )
211-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy )
210+
if( NOT TARGET hana-adapter )
211+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/hana-adapter )
212212
endif()
213213

214-
if( NOT TARGET njoy_c_bindings )
215-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy_c_bindings )
214+
if( NOT TARGET fmt-adapter )
215+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/fmt-adapter )
216216
endif()
217217

218-
if( NOT TARGET hana-adapter )
219-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/hana-adapter )
218+
if( NOT TARGET spdlog-adapter )
219+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/spdlog-adapter )
220220
endif()
221221

222-
if( NOT TARGET tclap-adapter )
223-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/tclap-adapter )
222+
if( NOT TARGET Log )
223+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/Log )
224224
endif()
225225

226-
if( NOT TARGET range-v3-adapter )
227-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/range-v3-adapter )
226+
if( NOT TARGET header-utilities )
227+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/header-utilities )
228228
endif()
229229

230-
if( NOT TARGET catch-adapter )
231-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/catch-adapter )
230+
if( NOT TARGET variant-adapter )
231+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/variant-adapter )
232232
endif()
233233

234-
if( NOT TARGET Log )
235-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/Log )
234+
if( NOT TARGET ENDFtk )
235+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/ENDFtk )
236236
endif()
237237

238-
if( NOT TARGET dimwits )
239-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/dimwits )
238+
if( NOT TARGET tclap-adapter )
239+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/tclap-adapter )
240240
endif()
241241

242-
if( NOT TARGET header-utilities )
243-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/header-utilities )
242+
if( NOT TARGET njoy )
243+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy )
244244
endif()
245245

246-
if( NOT TARGET utility )
247-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/utility )
246+
if( NOT TARGET njoy_c_bindings )
247+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/njoy_c_bindings )
248248
endif()
249249

250-
if( NOT TARGET disco )
251-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/disco )
250+
if( NOT TARGET json-adapter )
251+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/json-adapter )
252252
endif()
253253

254-
if( NOT TARGET ENDFtk )
255-
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/ENDFtk )
254+
if( NOT TARGET utility )
255+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/utility )
256256
endif()
257257

258258
if( NOT TARGET lipservice )
259259
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/lipservice )
260260
endif()
261261

262+
if( NOT TARGET dimwits )
263+
add_subdirectory( ${ROOT_DIRECTORY}/subprojects/dimwits )
264+
endif()
265+
262266

263267
if ( NOT GIT_EXECUTABLE )
264268
find_package( Git )
@@ -342,7 +346,7 @@ ${CXX_appended_flags} ${njoy21_appended_flags} )
342346

343347
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};>" )
344348

345-
target_link_libraries( njoy21 PUBLIC njoy_c_bindings PUBLIC variant-adapter PUBLIC lipservice PUBLIC tclap-adapter PUBLIC ENDFtk PUBLIC dimwits PUBLIC utility )
349+
target_link_libraries( njoy21 PUBLIC ENDFtk PUBLIC tclap-adapter PUBLIC njoy_c_bindings PUBLIC variant-adapter PUBLIC lipservice PUBLIC dimwits PUBLIC utility )
346350

347351
if ( NOT is_subproject )
348352
add_executable( njoy21_executable src/main.cpp )
@@ -369,10 +373,10 @@ endif()
369373
if( NOT is_subproject )
370374
enable_testing()
371375
if ( unit_tests )
372-
add_subdirectory( src/njoy21/Driver/test )
373-
add_subdirectory( src/njoy21/legacy/Sequence/test )
374376
add_subdirectory( src/njoy21/CommandLine/test )
377+
add_subdirectory( src/njoy21/Driver/test )
375378
add_subdirectory( src/njoy21/io/Manager/test )
379+
add_subdirectory( src/njoy21/legacy/Sequence/test )
376380
endif()
377381
add_subdirectory( tests )
378382
endif()

‎ReleaseNotes.md

+9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,15 @@
11
# Release Notes&mdash;NJOY21
22
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.
33

4+
## [NJOY21 1.0.5](https://github.com/njoy/NJOY21/pull/99)
5+
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:
6+
7+
- [Removal of dimwits units](https://github.com/njoy/lipservice/pull/10)
8+
- [Adding NZA option to ACER](https://github.com/njoy/lipservice/pull/11), and
9+
- [RECONR to JSON](https://github.com/njoy/lipservice/pull/12).
10+
11+
All of these are included in the this version of NJOY21.
12+
413
## [NJOY21 1.0.4](https://github.com/njoy/NJOY21/pull/93)
514
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).
615

‎dependencies/ENDFtk

Submodule ENDFtk updated 82 files

‎dependencies/lipservice

Submodule lipservice updated 362 files

0 commit comments

Comments
 (0)