diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 29eb0e4..d739f38 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -9,7 +9,7 @@ # For details about the syntax of this file, see # https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions -# Copyright 2023 The MathWorks, Inc. +# Copyright 2023-2024 The MathWorks, Inc. name: CI using MATLAB @@ -46,7 +46,7 @@ jobs: - name: Setup MATLAB uses: matlab-actions/setup-matlab@v1 with: - release: R2023a + release: R2023b - name: Run tests uses: matlab-actions/run-command@v1 @@ -63,9 +63,9 @@ jobs: - name: Setup MATLAB uses: matlab-actions/setup-matlab@v1 with: - release: R2023a + release: R2023b - name: Run tests uses: matlab-actions/run-command@v1 with: - command: openProject(pwd); testrunnerIndustrialMicrogrid; + command: openProject(pwd); testrunnerIndustrialMicrogrid; \ No newline at end of file diff --git a/Components/Microgrid Controller/BlackStart.slx b/Components/Microgrid Controller/BlackStart.slx index 2173e59..6607f28 100644 Binary files a/Components/Microgrid Controller/BlackStart.slx and b/Components/Microgrid Controller/BlackStart.slx differ diff --git a/Components/Microgrid Controller/PLL.slx b/Components/Microgrid Controller/PLL.slx index 180c692..fb680f3 100644 Binary files a/Components/Microgrid Controller/PLL.slx and b/Components/Microgrid Controller/PLL.slx differ diff --git a/Components/Microgrid Controller/PlannedIsland.slx b/Components/Microgrid Controller/PlannedIsland.slx index 83b311d..217a2e6 100644 Binary files a/Components/Microgrid Controller/PlannedIsland.slx and b/Components/Microgrid Controller/PlannedIsland.slx differ diff --git a/Components/Microgrid Controller/ReferenceGeneration.slx b/Components/Microgrid Controller/ReferenceGeneration.slx index 5b80d1c..f2b810e 100644 Binary files a/Components/Microgrid Controller/ReferenceGeneration.slx and b/Components/Microgrid Controller/ReferenceGeneration.slx differ diff --git a/Components/Microgrid Controller/Resynchronization.slx b/Components/Microgrid Controller/Resynchronization.slx index 3a26983..bcace71 100644 Binary files a/Components/Microgrid Controller/Resynchronization.slx and b/Components/Microgrid Controller/Resynchronization.slx differ diff --git a/Data/Industrial Microgrid/opCase1.mat b/Data/Industrial Microgrid/opCase1.mat index cf06bd7..ca140b2 100644 Binary files a/Data/Industrial Microgrid/opCase1.mat and b/Data/Industrial Microgrid/opCase1.mat differ diff --git a/Data/Industrial Microgrid/opCase2.mat b/Data/Industrial Microgrid/opCase2.mat index 8e5ce6a..a06cf40 100644 Binary files a/Data/Industrial Microgrid/opCase2.mat and b/Data/Industrial Microgrid/opCase2.mat differ diff --git a/Data/Industrial Microgrid/opCase3.mat b/Data/Industrial Microgrid/opCase3.mat index 55242bf..62a8864 100644 Binary files a/Data/Industrial Microgrid/opCase3.mat and b/Data/Industrial Microgrid/opCase3.mat differ diff --git a/Data/Industrial Microgrid/opCase4.mat b/Data/Industrial Microgrid/opCase4.mat index 9e88cd3..197eaf4 100644 Binary files a/Data/Industrial Microgrid/opCase4.mat and b/Data/Industrial Microgrid/opCase4.mat differ diff --git a/Data/Industrial Microgrid/opCase5.mat b/Data/Industrial Microgrid/opCase5.mat index 9e741d2..f91b9b3 100644 Binary files a/Data/Industrial Microgrid/opCase5.mat and b/Data/Industrial Microgrid/opCase5.mat differ diff --git a/Models/IndustrialMicrogrid.slx b/Models/IndustrialMicrogrid.slx index 3f6fb4d..2a9b5fd 100644 Binary files a/Models/IndustrialMicrogrid.slx and b/Models/IndustrialMicrogrid.slx differ diff --git a/Models/RemoteMicrogrid.slx b/Models/RemoteMicrogrid.slx index 2e20e45..ce5545a 100644 Binary files a/Models/RemoteMicrogrid.slx and b/Models/RemoteMicrogrid.slx differ diff --git a/ScriptData/Industrial Microgrid/InitializeModel.m b/ScriptData/Industrial Microgrid/InitializeModel.m index f029c7b..c240525 100644 --- a/ScriptData/Industrial Microgrid/InitializeModel.m +++ b/ScriptData/Industrial Microgrid/InitializeModel.m @@ -1,27 +1,38 @@ % This script is used for initializing the model for different cases -% Copyright 2023 The MathWorks, Inc. - -set_param(bdroot,'LoadInitialState','off'); -set_param(bdroot,'LoadExternalInput','off'); -IndustrialMicrogridInputData; -switch(caseNum) - case 1 - microgrid.controller2PlannedIsland = 20; - case 2 - microgrid.controller1Resynch = 20; % Time when resynch command is activated in controller 1 [s] - microgrid.controller1PlannedIsland = 20; % Time when planned island command is activated controller 1 [s] - case 3 - microgrid.controller1BlackStart = 20; - case 4 - microgrid.controller2BlackStart = 20; - case 5 - microgrid.controller2PCCBrk = 20; % Time when PCC breaker command is activated controller 2 [s] - microgrid.controller2PVBrk = 20; % Time when pv breaker command is activated controller 2 [s] - microgrid.controller2PowerCenterFault = 20; - microgrid.controller2PowerCenterBrk1 = microgrid.controller2PowerCenterFault+0.1; - microgrid.controller2PowerCenterBrk3 = microgrid.controller2PowerCenterFault+0.1; - microgrid.controller2SubstationBrk = microgrid.controller2PowerCenterFault+0.1; -end +% Copyright 2023 - 2024 The MathWorks, Inc. simTime = 10; -op = findop('IndustrialMicrogrid',simTime); \ No newline at end of file +model = 'IndustrialMicrogrid'; +for caseNum = 1:5 + load_system(model); + set_param(model,'LoadInitialState','off'); + set_param(model,'LoadExternalInput','off'); + switch(caseNum) + case 1 + IndustrialMicrogridInputData; + microgrid.controller2PlannedIsland = 20; + opCase1 = findop('IndustrialMicrogrid',simTime); + case 2 + IndustrialMicrogridInputData; + microgrid.controller1Resynch = 20; % Time when resynch command is activated in controller 1 [s] + microgrid.controller1PlannedIsland = 20; % Time when planned island command is activated controller 1 [s] + opCase2 = findop('IndustrialMicrogrid',simTime); + case 3 + IndustrialMicrogridInputData; + microgrid.controller1BlackStart = 20; + opCase3 = findop('IndustrialMicrogrid',simTime); + case 4 + IndustrialMicrogridInputData; + microgrid.controller2BlackStart = 20; + opCase4 = findop('IndustrialMicrogrid',simTime); + case 5 + IndustrialMicrogridInputData; + microgrid.controller2PCCBrk = 20; % Time when PCC breaker command is activated controller 2 [s] + microgrid.controller2PVBrk = 20; % Time when pv breaker command is activated controller 2 [s] + microgrid.controller2PowerCenterFault = 20; + microgrid.controller2PowerCenterBrk1 = microgrid.controller2PowerCenterFault+0.1; + microgrid.controller2PowerCenterBrk3 = microgrid.controller2PowerCenterFault+0.1; + microgrid.controller2SubstationBrk = microgrid.controller2PowerCenterFault+0.1; + opCase5 = findop('IndustrialMicrogrid',simTime); + end +end diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/-j7ff8riKSTWwtV8-Jszxo7xd38d.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/-j7ff8riKSTWwtV8-Jszxo7xd38d.xml index 25987ef..852c139 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/-j7ff8riKSTWwtV8-Jszxo7xd38d.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/-j7ff8riKSTWwtV8-Jszxo7xd38d.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/2VNAPeDO-OzBLC_fz-4nA8qrn0cd.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/2VNAPeDO-OzBLC_fz-4nA8qrn0cd.xml index f037532..e10ed17 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/2VNAPeDO-OzBLC_fz-4nA8qrn0cd.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/2VNAPeDO-OzBLC_fz-4nA8qrn0cd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/L0ylhkhun6SVetL6xVqVIaXzrFId.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/L0ylhkhun6SVetL6xVqVIaXzrFId.xml index 314f5dd..85695a3 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/L0ylhkhun6SVetL6xVqVIaXzrFId.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/L0ylhkhun6SVetL6xVqVIaXzrFId.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/R44HPsG-vGYQLkpvE-FD9kslG4sd.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/R44HPsG-vGYQLkpvE-FD9kslG4sd.xml deleted file mode 100644 index cc0c7b7..0000000 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/R44HPsG-vGYQLkpvE-FD9kslG4sd.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/R44HPsG-vGYQLkpvE-FD9kslG4sp.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/R44HPsG-vGYQLkpvE-FD9kslG4sp.xml deleted file mode 100644 index 6013ffe..0000000 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/R44HPsG-vGYQLkpvE-FD9kslG4sp.xml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/S2csBR_qJiCt1gubSrg-gsHE4ekd.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/S2csBR_qJiCt1gubSrg-gsHE4ekd.xml index bedf0ac..cbd4899 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/S2csBR_qJiCt1gubSrg-gsHE4ekd.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/S2csBR_qJiCt1gubSrg-gsHE4ekd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/SJKstq0iMPx8_gMEcJkDw3czfGwd.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/SJKstq0iMPx8_gMEcJkDw3czfGwd.xml index d6829e4..77304ce 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/SJKstq0iMPx8_gMEcJkDw3czfGwd.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/SJKstq0iMPx8_gMEcJkDw3czfGwd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/dFsjiKtcCegp6C3ftgk22oYLFOAd.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/dFsjiKtcCegp6C3ftgk22oYLFOAd.xml index 6153d79..1229b8c 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/dFsjiKtcCegp6C3ftgk22oYLFOAd.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/dFsjiKtcCegp6C3ftgk22oYLFOAd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/kbW7VQyWtfkLRONZoDEyT0IYxRYd.xml b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/kbW7VQyWtfkLRONZoDEyT0IYxRYd.xml index 6d8023d..2e68da4 100644 --- a/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/kbW7VQyWtfkLRONZoDEyT0IYxRYd.xml +++ b/resources/project/KAXfQgCar2Yb8zOxgvf9hdmLP1E/kbW7VQyWtfkLRONZoDEyT0IYxRYd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/2kj09UetkV_lru3gvSPXnY6-nM4d.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/2kj09UetkV_lru3gvSPXnY6-nM4d.xml index 7df3aba..7c09525 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/2kj09UetkV_lru3gvSPXnY6-nM4d.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/2kj09UetkV_lru3gvSPXnY6-nM4d.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/KKyDJtbdIBOlaeHmIZd5VX6vqx8d.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/KKyDJtbdIBOlaeHmIZd5VX6vqx8d.xml index 6af045e..fbb2a47 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/KKyDJtbdIBOlaeHmIZd5VX6vqx8d.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/KKyDJtbdIBOlaeHmIZd5VX6vqx8d.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QLqED9A0Q5bzgM5_Gw16s4VTx6sd.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QLqED9A0Q5bzgM5_Gw16s4VTx6sd.xml index d8c8ca9..a9429be 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QLqED9A0Q5bzgM5_Gw16s4VTx6sd.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QLqED9A0Q5bzgM5_Gw16s4VTx6sd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QWNDYJD5mGW1bWYvPx9DtKnxzw4d.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QWNDYJD5mGW1bWYvPx9DtKnxzw4d.xml index 66025a4..61bc266 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QWNDYJD5mGW1bWYvPx9DtKnxzw4d.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/QWNDYJD5mGW1bWYvPx9DtKnxzw4d.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/R1RggVhA72agIvELiuhWPRS8F0Id.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/R1RggVhA72agIvELiuhWPRS8F0Id.xml index e4f8416..96226df 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/R1RggVhA72agIvELiuhWPRS8F0Id.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/R1RggVhA72agIvELiuhWPRS8F0Id.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/aEHSZBIY-yve10yGis12Zr5DLZod.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/aEHSZBIY-yve10yGis12Zr5DLZod.xml index 3296a42..5b30f4e 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/aEHSZBIY-yve10yGis12Zr5DLZod.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/aEHSZBIY-yve10yGis12Zr5DLZod.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/eeYgJBRGd88c80NLKyogapL50zId.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/eeYgJBRGd88c80NLKyogapL50zId.xml index c2983d3..7759a7d 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/eeYgJBRGd88c80NLKyogapL50zId.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/eeYgJBRGd88c80NLKyogapL50zId.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/j4xwF_j8iFTVayUMfxLgMnTbencd.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/j4xwF_j8iFTVayUMfxLgMnTbencd.xml index 37b6449..e47ab1f 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/j4xwF_j8iFTVayUMfxLgMnTbencd.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/j4xwF_j8iFTVayUMfxLgMnTbencd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/r8LR4nLmg9ai3oHrW1r_-KocQzkd.xml b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/r8LR4nLmg9ai3oHrW1r_-KocQzkd.xml index bcfd5f8..f9f98e8 100644 --- a/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/r8LR4nLmg9ai3oHrW1r_-KocQzkd.xml +++ b/resources/project/NjSPEMsIuLUyIpr2u1Js5bVPsOs/r8LR4nLmg9ai3oHrW1r_-KocQzkd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/resources/project/fjRQtWiSIy7hIlj-Kmk87M7s21k/NjSPEMsIuLUyIpr2u1Js5bVPsOsd.xml b/resources/project/fjRQtWiSIy7hIlj-Kmk87M7s21k/NjSPEMsIuLUyIpr2u1Js5bVPsOsd.xml index 22ed7ad..310a18c 100644 --- a/resources/project/fjRQtWiSIy7hIlj-Kmk87M7s21k/NjSPEMsIuLUyIpr2u1Js5bVPsOsd.xml +++ b/resources/project/fjRQtWiSIy7hIlj-Kmk87M7s21k/NjSPEMsIuLUyIpr2u1Js5bVPsOsd.xml @@ -1,2 +1,2 @@ - \ No newline at end of file + \ No newline at end of file