diff --git a/README.md b/README.md index dc13e43..ed3085c 100644 --- a/README.md +++ b/README.md @@ -73,7 +73,7 @@ A few categories of scripts are available: | generate_endf | ENDF/B | VII.1
VIII.0 | NNDC | | generate_fendl | FENDL | 3.2c
3.2b
3.2a
3.2
3.1d
3.1a
3.0 | | | generate_jendl | JENDL | 4.0
5.0 | | -| generate_tendl | TENDL | 2023 | | +| generate_tendl | TENDL | 2023
2025 | | ### Download cross sections diff --git a/src/openmc_data/generate/generate_tendl.py b/src/openmc_data/generate/generate_tendl.py index 54cc0fc..d4e1091 100644 --- a/src/openmc_data/generate/generate_tendl.py +++ b/src/openmc_data/generate/generate_tendl.py @@ -38,9 +38,9 @@ class CustomFormatter(argparse.ArgumentDefaultsHelpFormatter, default='latest', help="Output HDF5 versioning. Use " "'earliest' for backwards compatibility or 'latest' for " "performance") -parser.add_argument('-r', '--release', choices=["2023"], default="2023", +parser.add_argument('-r', '--release', choices=["2023", "2025"], default="2025", help="The nuclear data library release version. " - "The options currently supported are 2023") + "The options currently supported are 2023 and 2025") parser.add_argument('--cleanup', action='store_true', help="Remove download directories when data has " "been processed") @@ -95,7 +95,7 @@ def main(): # GENERATE HDF5 LIBRARY -- NEUTRON FILES # Get a list of all ENDF files - neutron_files = endf_files_dir.glob('*.tendl') + neutron_files = endf_files_dir.glob(details['endf_files']) # Create output directory if it doesn't exist args.destination.mkdir(parents=True, exist_ok=True) diff --git a/src/openmc_data/urls.py b/src/openmc_data/urls.py index c87cba8..5295997 100644 --- a/src/openmc_data/urls.py +++ b/src/openmc_data/urls.py @@ -53,13 +53,25 @@ "endf": { "base_url": "https://tendl.web.psi.ch/tendl_2023/tar_files/", "compressed_files": ["TENDL-n.2024new.tgz"], - "neutron_files": "tendl24c/*", - "metastables": "tendl24c/*m", - "compressed_file_size": 3.1, + "endf_files": "n-*.tendl", + "metastables": "n-*m.tendl", + "compressed_file_size": 3.5, "uncompressed_file_size": 20, } } }, + "2025": { + "neutron": { + "endf": { + "base_url": "https://tendl.web.psi.ch/tendl_2025/tar_files/", + "compressed_files": ["TENDL-n.tgz"], + "endf_files": "n-*.tendl", + "metastables": "n-*m.tendl", + "compressed_file_size": 3.1, + "uncompressed_file_size": 13.9, + } + } + }, }, "fendl": { "3.2c": {