Skip to content

Commit cb77480

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ortools_build
2 parents f4a0ca4 + 035d62c commit cb77480

File tree

654 files changed

+668
-668
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

654 files changed

+668
-668
lines changed

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
BSD 3-Clause License
22

3-
Copyright (c) 2017, 2022 Alliance for Sustainable Energy, LLC
3+
Copyright (c) 2017, 2022 Alliance for Energy Innovation, LLC
44
All rights reserved.
55

66
Redistribution and use in source and binary forms, with or without

code_attic/Heliostat_AzElAod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/atmospheric_aod.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/atmospheric_aod.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/cmod_annualoutput.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/cmod_cb_mspt_system_costs.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/cmod_csp_common_eqns.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/cmod_csp_common_eqns.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/cmod_csp_tower_eqns.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

code_attic/cmod_csp_tower_eqns.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Sustainable Energy, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/ssc/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

0 commit comments

Comments
 (0)