From c15564b8260f00ada383d90e654d085b9f26d077 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Fri, 24 Sep 2021 16:29:53 -0500 Subject: [PATCH 1/2] Update copyright to include UChicago Argonne, LLC --- LICENSE | 3 ++- docs/source/conf.py | 2 +- docs/source/license.rst | 3 ++- man/man1/openmc.1 | 4 ++-- src/output.cpp | 20 ++++++++++---------- 5 files changed, 17 insertions(+), 15 deletions(-) diff --git a/LICENSE b/LICENSE index 848a23845..79f0c96f0 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,5 @@ -Copyright (c) 2011-2021 Massachusetts Institute of Technology and OpenMC contributors +Copyright (c) 2011-2021 Massachusetts Institute of Technology, UChicago Argonne, +LLC, and OpenMC contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/docs/source/conf.py b/docs/source/conf.py index 52d872abf..33fb515a5 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -62,7 +62,7 @@ master_doc = 'index' # General information about the project. project = 'OpenMC' -copyright = '2011-2021, Massachusetts Institute of Technology and OpenMC contributors' +copyright = '2011-2021, Massachusetts Institute of Technology, UChicago Argonne, LLC, and OpenMC contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/source/license.rst b/docs/source/license.rst index 40ab106ad..5a3d40763 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -4,7 +4,8 @@ License Agreement ================= -Copyright © 2011-2021 Massachusetts Institute of Technology and OpenMC contributors +Copyright © 2011-2021 Massachusetts Institute of Technology, UChicago Argonne, +LLC, and OpenMC contributors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/man/man1/openmc.1 b/man/man1/openmc.1 index 8a93af514..989e846e0 100644 --- a/man/man1/openmc.1 +++ b/man/man1/openmc.1 @@ -57,8 +57,8 @@ Indicates the default path to an HDF5 file that contains multi-group cross section libraries if the user has not specified the tag in .I materials.xml\fP. .SH LICENSE -Copyright \(co 2011-2021 Massachusetts Institute of Technology and OpenMC -contributors. +Copyright \(co 2011-2021 Massachusetts Institute of Technology, UChicago +Argonne, LLC, and OpenMC contributors. .PP Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/src/output.cpp b/src/output.cpp index 73f3a0e9a..b78314823 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -72,26 +72,26 @@ void title() // Write version information fmt::print( - " | The OpenMC Monte Carlo Code\n" - " Copyright | 2011-2021 MIT and OpenMC contributors\n" - " License | https://docs.openmc.org/en/latest/license.html\n" - " Version | {}.{}.{}{}\n", + " | The OpenMC Monte Carlo Code\n" + " Copyright | 2011-2021 MIT, UChicago Argonne, LLC and contributors\n" + " License | https://docs.openmc.org/en/latest/license.html\n" + " Version | {}.{}.{}{}\n", VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE, VERSION_DEV ? "-dev" : ""); #ifdef GIT_SHA1 - fmt::print(" Git SHA1 | {}\n", GIT_SHA1); + fmt::print(" Git SHA1 | {}\n", GIT_SHA1); #endif // Write the date and time - fmt::print(" Date/Time | {}\n", time_stamp()); + fmt::print(" Date/Time | {}\n", time_stamp()); #ifdef OPENMC_MPI // Write number of processors - fmt::print(" MPI Processes | {}\n", mpi::n_procs); + fmt::print(" MPI Processes | {}\n", mpi::n_procs); #endif #ifdef _OPENMP // Write number of OpenMP threads - fmt::print(" OpenMP Threads | {}\n", omp_get_max_threads()); + fmt::print(" OpenMP Threads | {}\n", omp_get_max_threads()); #endif std::cout << std::endl; } @@ -335,8 +335,8 @@ void print_version() #ifdef GIT_SHA1 fmt::print("Git SHA1: {}\n", GIT_SHA1); #endif - fmt::print("Copyright (c) 2011-2021 Massachusetts Institute of " - "Technology and OpenMC contributors\nMIT/X license at " + fmt::print("Copyright (c) 2011-2021 MIT, UChicago Argonne, LLC, and " + "contributors\nMIT/X license at " "\n"); } } From 2cadd1d3ed2f64800ddb38eaf000d3d5f423f094 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Mon, 4 Oct 2021 15:39:00 -0500 Subject: [PATCH 2/2] Remove comma in UChicago Argonne, LLC Co-authored-by: Patrick Shriwise --- LICENSE | 2 +- docs/source/conf.py | 2 +- docs/source/license.rst | 2 +- man/man1/openmc.1 | 2 +- src/output.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LICENSE b/LICENSE index 79f0c96f0..3523dd370 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2011-2021 Massachusetts Institute of Technology, UChicago Argonne, +Copyright (c) 2011-2021 Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/docs/source/conf.py b/docs/source/conf.py index 33fb515a5..a10494260 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -62,7 +62,7 @@ master_doc = 'index' # General information about the project. project = 'OpenMC' -copyright = '2011-2021, Massachusetts Institute of Technology, UChicago Argonne, LLC, and OpenMC contributors' +copyright = '2011-2021, Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors' # The version info for the project you're documenting, acts as replacement for # |version| and |release|, also used in various other places throughout the diff --git a/docs/source/license.rst b/docs/source/license.rst index 5a3d40763..d8ea319aa 100644 --- a/docs/source/license.rst +++ b/docs/source/license.rst @@ -4,7 +4,7 @@ License Agreement ================= -Copyright © 2011-2021 Massachusetts Institute of Technology, UChicago Argonne, +Copyright © 2011-2021 Massachusetts Institute of Technology, UChicago Argonne LLC, and OpenMC contributors Permission is hereby granted, free of charge, to any person obtaining a copy of diff --git a/man/man1/openmc.1 b/man/man1/openmc.1 index 989e846e0..f99389069 100644 --- a/man/man1/openmc.1 +++ b/man/man1/openmc.1 @@ -58,7 +58,7 @@ section libraries if the user has not specified the tag in .I materials.xml\fP. .SH LICENSE Copyright \(co 2011-2021 Massachusetts Institute of Technology, UChicago -Argonne, LLC, and OpenMC contributors. +Argonne LLC, and OpenMC contributors. .PP Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in diff --git a/src/output.cpp b/src/output.cpp index b78314823..7bc012296 100644 --- a/src/output.cpp +++ b/src/output.cpp @@ -73,7 +73,7 @@ void title() // Write version information fmt::print( " | The OpenMC Monte Carlo Code\n" - " Copyright | 2011-2021 MIT, UChicago Argonne, LLC and contributors\n" + " Copyright | 2011-2021 MIT, UChicago Argonne LLC, and contributors\n" " License | https://docs.openmc.org/en/latest/license.html\n" " Version | {}.{}.{}{}\n", VERSION_MAJOR, VERSION_MINOR, VERSION_RELEASE, VERSION_DEV ? "-dev" : ""); @@ -335,7 +335,7 @@ void print_version() #ifdef GIT_SHA1 fmt::print("Git SHA1: {}\n", GIT_SHA1); #endif - fmt::print("Copyright (c) 2011-2021 MIT, UChicago Argonne, LLC, and " + fmt::print("Copyright (c) 2011-2021 MIT, UChicago Argonne LLC, and " "contributors\nMIT/X license at " "\n"); }