From dc4810e840357eae5d00c116162506b4be726a5d Mon Sep 17 00:00:00 2001 From: Joseph McKinsey Date: Fri, 13 Jan 2023 13:03:01 -0700 Subject: [PATCH 1/3] Fix numpy issue in localfeeder --- LocalFeeder/FeederSimulator.py | 8 ++++---- LocalFeeder/dss_functions.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/LocalFeeder/FeederSimulator.py b/LocalFeeder/FeederSimulator.py index ba09c49..9824d00 100644 --- a/LocalFeeder/FeederSimulator.py +++ b/LocalFeeder/FeederSimulator.py @@ -277,7 +277,7 @@ def get_PQs_load(self,static=False): PQ_load[index] += power/len(ld['phases']) else: power = dss.CktElement.Powers() - PQ_load[index] += np.complex(power[2 * ii], power[2 * ii + 1]) + PQ_load[index] += complex(power[2 * ii], power[2 * ii + 1]) PQ_names[index] = name PQ_types[index] = 'Load' @@ -302,7 +302,7 @@ def get_PQs_pv(self,static=False): PQ_PV[index] += power/(len(bus)-1) else: power = dss.CktElement.Powers() - PQ_PV[index] += np.complex(power[2 * ii], power[2 * ii + 1]) + PQ_PV[index] += complex(power[2 * ii], power[2 * ii + 1]) PQ_names[index] = name PQ_types[index] = 'PVSystem' return PQ_PV,PQ_names,PQ_types @@ -324,7 +324,7 @@ def get_PQs_gen(self,static=False): PQ_gen[index] += power/(len(bus)-1) else: power = dss.CktElement.Powers() - PQ_gen[index] += np.complex(power[2 * ii], power[2 * ii + 1]) + PQ_gen[index] += complex(power[2 * ii], power[2 * ii + 1]) PQ_names[index] = name PQ_types[index] = 'Generator' return PQ_gen,PQ_names,PQ_types @@ -343,7 +343,7 @@ def get_PQs_cap(self,static=False): power = complex(0,-1*cap['kVar']) #-1 because it's injected into the grid PQ_cap[index] += power/cap["numPhases"] else: - PQ_cap[index] = np.complex(0,cap["power"][2 * ii + 1]) + PQ_cap[index] = complex(0,cap["power"][2 * ii + 1]) PQ_names[index] = name PQ_types[index] = 'Capacitor' diff --git a/LocalFeeder/dss_functions.py b/LocalFeeder/dss_functions.py index bc4ae32..aaab04f 100644 --- a/LocalFeeder/dss_functions.py +++ b/LocalFeeder/dss_functions.py @@ -84,7 +84,7 @@ def get_vnom2(dss): V = np.ones(len(Vnom) // 2, dtype=np.complex_) for i in range(len(V)): - V[i] = np.complex(Vnom[2 * i], Vnom[2 * i + 1]) + V[i] = complex(Vnom[2 * i], Vnom[2 * i + 1]) vnom_dict = {AllNodeNames[ii].upper(): V[ii] for ii in range(len(V))} return V, vnom_dict @@ -100,7 +100,7 @@ def get_vnom(dss): base = bases[-1] / math.sqrt(3) V = np.ones(len(Vnom) // 2, dtype=np.complex_) for i in range(len(V)): - V[i] = np.complex(Vnom[2 * i], Vnom[2 * i + 1]) / (base * 1000) + V[i] = complex(Vnom[2 * i], Vnom[2 * i + 1]) / (base * 1000) vnom_dict = {AllNodeNames[ii].upper(): V[ii] for ii in range(len(V))} dss.run_command('BatchEdit Load..* enabled=yes') From ee2aef63f8218a1efb582b524e4a98817719cf23 Mon Sep 17 00:00:00 2001 From: Joseph McKinsey Date: Fri, 13 Jan 2023 13:20:10 -0700 Subject: [PATCH 2/3] Remove CI_TOKEN from github actions? --- .github/workflows/docker-test.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/docker-test.yml b/.github/workflows/docker-test.yml index f3d0edb..8544016 100644 --- a/.github/workflows/docker-test.yml +++ b/.github/workflows/docker-test.yml @@ -11,9 +11,6 @@ jobs: python-version: ['3.10'] steps: - uses: actions/checkout@v2 - with: - submodules: true - token: ${{ secrets.CI_TOKEN }} - name: build docker container shell: bash run: | From 55c0c227da8ca812dd9cfbcbd85667e78df6fb9a Mon Sep 17 00:00:00 2001 From: Joseph McKinsey Date: Fri, 13 Jan 2023 13:52:03 -0700 Subject: [PATCH 3/3] Remove other CI_TOKEN usage --- .github/workflows/test-api.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/test-api.yml b/.github/workflows/test-api.yml index 982deae..afefbad 100644 --- a/.github/workflows/test-api.yml +++ b/.github/workflows/test-api.yml @@ -15,9 +15,6 @@ jobs: steps: - uses: actions/checkout@v2 - with: - submodules: true - token: ${{ secrets.CI_TOKEN }} - name: Set up Python ${{ matrix.python-version }} uses: conda-incubator/setup-miniconda@v2 with: