Skip to content

Commit ab1f57b

Browse files
janinefreemanjaninefreeman
authored
Merge pull request #196 from NatLabRockies/globalnamechange
Rename NREL throughout code
2 parents 2678dca + 7c01d81 commit ab1f57b

51 files changed

Lines changed: 71 additions & 71 deletions

Some content is hidden

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

‎src/codeedit.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

‎src/csv.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

‎src/diurnal.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

‎src/dview/dvautocolourassigner.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

‎src/dview/dvdcctrl.cpp‎

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

8787
void wxDVDCCtrl::ReadState(std::string filename) {
88-
wxConfig cfg("DView", "NREL");
88+
wxConfig cfg("DView", "NLR");
8989

9090
wxString s;
9191
bool success;
@@ -111,7 +111,7 @@ void wxDVDCCtrl::ReadState(std::string filename) {
111111
}
112112

113113
void wxDVDCCtrl::WriteState(std::string filename) {
114-
wxConfig cfg("DView", "NREL");
114+
wxConfig cfg("DView", "NLR");
115115

116116
bool success;
117117
bool debugging = false;

‎src/dview/dvdmapctrl.cpp‎

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

308308
void wxDVDMapCtrl::ReadState(std::string filename) {
309-
wxConfig cfg("DView", "NREL");
309+
wxConfig cfg("DView", "NLR");
310310

311311
wxString s;
312312
bool success;
@@ -384,7 +384,7 @@ void wxDVDMapCtrl::OnTimer(wxTimerEvent &) {
384384
}
385385

386386
void wxDVDMapCtrl::WriteState(std::string filename) {
387-
wxConfig cfg("DView", "NREL");
387+
wxConfig cfg("DView", "NLR");
388388

389389
bool success;
390390
bool debugging = false;

‎src/dview/dvfilereader.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
BSD 3-Clause License
33
4-
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without
@@ -1409,7 +1409,7 @@ bool wxDVFileReader::IsDate(wxString stringToCheck) {
14091409
// Conversion factors from Energy+.idd
14101410
void wxDVFileReader::InitUnitConversions() {
14111411
// NOTE: tuple format (SI unit string, IP unit string, SI to IP conversion factor)
1412-
// See SetupUnitConversions method in https://github.com/NREL/EnergyPlus/blob/develop/src/EnergyPlus/OutputReportTabular.cc
1412+
// See SetupUnitConversions method in https://github.com/NatLabRockies/EnergyPlus/blob/develop/src/EnergyPlus/OutputReportTabular.cc
14131413
m_unitConversions.emplace_back("$/(m3/s)", "$/(ft3/min)", 0.000472000059660808);
14141414
m_unitConversions.emplace_back("$/(W/K)", "$/(Btu/h-F)", 0.52667614683731);
14151415
m_unitConversions.emplace_back("$/kW", "$/(kBtuh/h)", 0.293083235638921);

‎src/dview/dvplotctrl.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

‎src/dview/dvplotctrlsettings.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/blob/develop/LICENSE
55
All rights reserved.
66
77
Redistribution and use in source and binary forms, with or without

‎src/dview/dvplothelper.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 Energy Innovation, LLC. See also https://github.com/NREL/wex/blob/develop/LICENSE
4+
Copyright (c) Alliance for Energy Innovation, LLC. See also https://github.com/NatLabRockies/wex/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)