diff --git a/convert_tendl.py b/convert_tendl.py index 824ae1a..2b337d8 100755 --- a/convert_tendl.py +++ b/convert_tendl.py @@ -70,7 +70,7 @@ class CustomFormatter(argparse.ArgumentDefaultsHelpFormatter, # This can be exstened to accommodated new releases release_details = { '2015': { - 'base_url': 'https://tendl.web.psi.ch/tendl_2015/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2015/tar_files/', 'compressed_files': ['ACE-n.tgz'], 'neutron_files': ace_files_dir.glob('neutron_file/*/*/lib/endf/*-n.ace'), 'metastables': ace_files_dir.glob('neutron_file/*/*/lib/endf/*m-n.ace'), @@ -78,7 +78,7 @@ class CustomFormatter(argparse.ArgumentDefaultsHelpFormatter, 'uncompressed_file_size': '40 GB' }, '2017': { - 'base_url': 'https://tendl.web.psi.ch/tendl_2017/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2017/tar_files/', 'compressed_files': ['tendl17c.tar.bz2'], 'neutron_files': ace_files_dir.glob('ace-17/*'), 'metastables': ace_files_dir.glob('ace-17/*m'), @@ -86,7 +86,7 @@ class CustomFormatter(argparse.ArgumentDefaultsHelpFormatter, 'uncompressed_file_size': '14 GB' }, '2019': { - 'base_url': 'https://tendl.web.psi.ch/tendl_2019/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2019/tar_files/', 'compressed_files': ['tendl19c.tar.bz2'], 'neutron_files': ace_files_dir.glob('tendl19c/*'), 'metastables': ace_files_dir.glob('tendl19c/*m'), @@ -94,7 +94,7 @@ class CustomFormatter(argparse.ArgumentDefaultsHelpFormatter, 'uncompressed_file_size': '10.1 GB' }, '2021': { - 'base_url': 'https://tendl.web.psi.ch/tendl_2021/tar_files/', + 'base_url': 'https://tendl.imperial.ac.uk/tendl_2021/tar_files/', 'compressed_files': ['tendl21c.tar.bz2'], 'neutron_files': ace_files_dir.glob('tendl21c/*'), 'metastables': ace_files_dir.glob('tendl21c/*m'), diff --git a/convert_tendl_rand.py b/convert_tendl_rand.py index a1955e7..61a057f 100755 --- a/convert_tendl_rand.py +++ b/convert_tendl_rand.py @@ -95,15 +95,15 @@ def main(): release_details = { "ENDF2017": { - "base_url": "https://tendl.web.psi.ch/tendl_2017/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2017/tar_files/", "ending": ".random.tgz", }, "ENDF2015": { - "base_url": "https://tendl.web.psi.ch/tendl_2015/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2015/tar_files/", "ending": ".random.tgz", }, "ACE2015": { - "base_url": "https://tendl.web.psi.ch/tendl_2015/tar_files/", + "base_url": "https://tendl.imperial.ac.uk/tendl_2015/tar_files/", "ending": ".10.2016.tgz", }, } diff --git a/depletion/generate_tendl_chain.py b/depletion/generate_tendl_chain.py index 59dce5e..4a71721 100755 --- a/depletion/generate_tendl_chain.py +++ b/depletion/generate_tendl_chain.py @@ -19,7 +19,7 @@ from utils import download, fix_missing_tpid -NEUTRON_LIB = 'https://tendl.web.psi.ch/tendl_2019/tar_files/TENDL-n.tgz' +NEUTRON_LIB = 'https://tendl.imperial.ac.uk/tendl_2019/tar_files/TENDL-n.tgz' DECAY_LIB = { 'jeff33': 'https://www.oecd-nea.org/dbdata/jeff/jeff33/downloads/JEFF33-rdd.zip', 'endf80': 'https://www.nndc.bnl.gov/endf-b8.0/zips/ENDF-B-VIII.0_decay.zip', diff --git a/generate_endf.py b/generate_endf.py index dbc6133..6d8fc74 100755 --- a/generate_endf.py +++ b/generate_endf.py @@ -1,7 +1,7 @@ #!/usr/bin/env python3 """ -Download ENDF/B-VIII.0 or ENDF/B-VII.1 library for use in OpenMC by first +Download ENDF/B-VIII.1, ENDF/B-VIII.0 or ENDF/B-VII.1 library for use in OpenMC by first processing ENDF files using NJOY. The resulting library will contain incident neutron, incident photon, and thermal scattering data. """ diff --git a/generate_jeff33.py b/generate_jeff33.py index 77d4455..a6a1f9b 100755 --- a/generate_jeff33.py +++ b/generate_jeff33.py @@ -78,8 +78,8 @@ def sort_key(path): ] tendl_files = [ - 'https://tendl.web.psi.ch/tendl_2019/neutron_file/C/C013/lib/endf/n-C013.tendl', - 'https://tendl.web.psi.ch/tendl_2019/neutron_file/O/O017/lib/endf/n-O017.tendl', + 'https://tendl.imperial.ac.uk/tendl_2017/neutron_file/C/C013/lib/endf/n-C013.tendl', + 'https://tendl.imperial.ac.uk/tendl_2017/neutron_file/O/O017/lib/endf/n-O017.tendl', ] neutron_dir = Path('endf6')