Bug fix for AWHP and room layout on on Simulink Canvas getNonRotatedRoomVertices. Some other associated files have changed too due to check introduced for Apartment rotation in getNonRotatedRoomVertices

Author: vikrants

Components/Libraries/+AirWaterHeatPump/AirWaterHeatPump.ssc

@@ -73,11 +73,11 @@ component (Propagation = blocks) AirWaterHeatPump
                                      value(seasonalCOPvalE,'1'), ...
                                      value(seasonalCOPvalF,'1')],'1'};
         capacityVector = {[value(nominalCapacityA,'W'), ...
-                           value(nominalCapacityA,'W'), ...
-                           value(nominalCapacityA,'W'), ...
-                           value(nominalCapacityA,'W'), ...
-                           value(nominalCapacityA,'W'), ...
-                           value(nominalCapacityA,'W')], 'W'};
+                           value(nominalCapacityB,'W'), ...
+                           value(nominalCapacityC,'W'), ...
+                           value(nominalCapacityD,'W'), ...
+                           value(nominalCapacityE,'W'), ...
+                           value(nominalCapacityF,'W')], 'W'};
         airTemperatureVector = 273 + [-2 -2 7 7 35 35];
         waterTemperatureVector = 273 + [55 65 35 45 18 7];
         waterSpHeat = {4186, 'J/kg/K'};

Components/Libraries/AirWaterHeatPump_lib.slx

@@ -21,27 +21,32 @@ function addBlockConcatSignalPS(NameValueArgs)
             set_param(blkNameConcatPort(1,count),'Side','left');
         end
     end
-
-    newBlk = 0;
-    blkNameConcatNew = strings(1,count-1);
-    for i = 1:count-1
-        newBlk = newBlk+1;
-        blkNameConcatNew(1,i) = strcat(NameValueArgs.BlkName,'/concat',num2str(newBlk));
-        add_block(NameValueArgs.LibBlockPath.concatPS,blkNameConcatNew(1,i),'Position',[50+newBlk*50 50*i+10 70+newBlk*50 50*i+10+20]);
-        set_param(blkNameConcatNew(1,i),'catColumns',NameValueArgs.ConcatColumns)
-    end
-
-    simscape.addConnection(blkNameConcatPort(1,1),"port",blkNameConcatNew(1,1),"I1");
-    simscape.addConnection(blkNameConcatPort(1,2),"port",blkNameConcatNew(1,1),"I2");
-
-    for i = 1:newBlk-1
-        simscape.addConnection(blkNameConcatNew(1,i),"O",blkNameConcatNew(1,i+1),"I1");
-        simscape.addConnection(blkNameConcatPort(1,i+2),"port",blkNameConcatNew(1,i+1),"I2");
+    
+    if count > 1
+        newBlk = 0;
+        blkNameConcatNew = strings(1,count-1);
+        for i = 1:count-1
+            newBlk = newBlk+1;
+            blkNameConcatNew(1,i) = strcat(NameValueArgs.BlkName,'/concat',num2str(newBlk));
+            add_block(NameValueArgs.LibBlockPath.concatPS,blkNameConcatNew(1,i),'Position',[50+newBlk*50 50*i+10 70+newBlk*50 50*i+10+20]);
+            set_param(blkNameConcatNew(1,i),'catColumns',NameValueArgs.ConcatColumns)
+        end
+        
+        simscape.addConnection(blkNameConcatPort(1,1),"port",blkNameConcatNew(1,1),"I1");
+        simscape.addConnection(blkNameConcatPort(1,2),"port",blkNameConcatNew(1,1),"I2");
+        
+        if newBlk > 1
+            for i = 1:newBlk-1
+                simscape.addConnection(blkNameConcatNew(1,i),"O",blkNameConcatNew(1,i+1),"I1");
+                simscape.addConnection(blkNameConcatPort(1,i+2),"port",blkNameConcatNew(1,i+1),"I2");
+            end
+        end
+    
+        blkNameConcatPortOut = strcat(NameValueArgs.BlkName,'/v');
+        add_block(NameValueArgs.LibBlockPath.connPort,blkNameConcatPortOut,'Position',[50+newBlk*50+100 50*i+10 70+newBlk*50+150 50*i+10+20]);
+    
+        set_param(blkNameConcatPortOut,'Orientation','left');
+        set_param(blkNameConcatPortOut,'Side','right');
+        simscape.addConnection(blkNameConcatNew(1,end),"O",blkNameConcatPortOut,"port");
     end
-
-    blkNameConcatPortOut = strcat(NameValueArgs.BlkName,'/v');
-    add_block(NameValueArgs.LibBlockPath.connPort,blkNameConcatPortOut,'Position',[50+newBlk*50+100 50*i+10 70+newBlk*50+150 50*i+10+20]);
-    set_param(blkNameConcatPortOut,'Orientation','left');
-    set_param(blkNameConcatPortOut,'Side','right');
-    simscape.addConnection(blkNameConcatNew(1,end),"O",blkNameConcatPortOut,"port");
 end

Components/Test/TestHarness/TestCompositeAWHP.slx

@@ -19,6 +19,7 @@
     msgDisplayCount = displayDiagnostics(ErrorMsg="Completed reading building part file",ErrorMsgNum=msgDisplayCount,Diagnostics=NameValueArgs.Diagnostics);
 
     [nApt, nRooms] = getNumAptAndRoomsFromFloorPlan(apartment3D);
+
     if NameValueArgs.ModelType == "Heat Load Analysis"
         for i = 1:nApt
             for j = 1:nRooms(i,1)
@@ -55,7 +56,7 @@
     msgDisplayCount = displayDiagnostics(ErrorMsg=strcat("Opened model ",NameValueArgs.BuildingLibraryName,".slx to create building library"),ErrorMsgNum=msgDisplayCount,Diagnostics=NameValueArgs.Diagnostics);
 
     topFloorLevelNum = apartment3D.apartment1.room1.geometry.dim.topFloorLevelNum;
-    
+
     % Initialize data to store block paths for the model
     mdlBlkPath = initializeModelBlockPathMatrices(BuildingModel=apartment3D);
     % Create subsystem for ground, roof, floors, and building floor level plans
@@ -90,23 +91,26 @@
         for idx = 1:size(listofRooms,1)
             i = listofRooms(idx,1);
             j = listofRooms(idx,2);
-
             % mdlBlkPath.nodesPerFloorLvl(:,i): i=1 stores # Thermal Nodes
             %                                   i=2 stores # TL nodes
             mdlBlkPath.nodesPerFloorLvl(floorLevelNum,1) = mdlBlkPath.nodesPerFloorLvl(floorLevelNum,1)+1;
             % The room or floorplan might have been rotated (XML definition) and hence
             % it is important to realign them to X-Y axis.
             roomJvert = getNonRotatedRoomVertices(Apartment=apartment3D,NumberApartment=i,NumberRoom=j);
             mdlBlkPath.areaNameRoom(i,j) = strcat(mdlBlkPath.blkNameFloorLevel(floorLevelNum,1),"/A",num2str(i),"R",num2str(j)," (",apartment3D.("apartment"+i).("room"+j).name,")");
-            nonRotatedLoc = [roomJvert(1,:),roomJvert(3,:)]*scaleToPlot;
+            min_X = min(roomJvert(:,1));min_Y = min(roomJvert(:,2));
+            max_X = max(roomJvert(:,1));max_Y = max(roomJvert(:,2));
+            nonRotatedLoc = [min_X,min_Y,max_X,max_Y]*scaleToPlot;
+            % nonRotatedLoc = [roomJvert(1,:),roomJvert(3,:)]*scaleToPlot;
             mdlBlkPath.areaNameRoomLoc(i,j) = num2str(nonRotatedLoc);
             areaColor = [0.99*max(0.9,rand(1)) 0.88*max(0.9,rand(1)) 0.99*max(0.9,rand(1)) 0.88*max(0.9,rand(1))];
             add_block("built-in/Area",mdlBlkPath.areaNameRoom(i,j),"Position",nonRotatedLoc,"BackgroundColor", mat2str(areaColor));
             % To plot rooms, you must first find their non-rotated vertices and data 
             % that align along the X and Y axes.
-            delX = (nonRotatedLoc(1,3)-nonRotatedLoc(1,1))*accomodateWall; % Calculate delX from diagonal vertices
-            delY = (nonRotatedLoc(1,4)-nonRotatedLoc(1,2))*accomodateWall; % Calculate delY from diagonal vertices
+            delX = abs(nonRotatedLoc(1,3)-nonRotatedLoc(1,1))*accomodateWall; % Calculate delX from diagonal vertices
+            delY = abs(nonRotatedLoc(1,4)-nonRotatedLoc(1,2))*accomodateWall; % Calculate delY from diagonal vertices
             roomJvertNonRotated = [nonRotatedLoc(1,1)+delX, nonRotatedLoc(1,2)+delY,nonRotatedLoc(1,3)-delX, nonRotatedLoc(1,4)-delY];
+            
             roomNameDisp = apartment3D.("apartment"+i).("room"+j).name;
             if floorLevelNum == 1
                 mdlBlkPath.areaNameGround(i,j) = addFloorOrRoofElement(WallName=strcat("Ground_A",num2str(i),"R",num2str(j),"(",roomNameDisp,")"),...
@@ -413,7 +417,7 @@
         mdlBlkPath.blkNameWallExternal(rangeExtWalls,1) = mdlBlkPath.blkNameExtWall(:,1);
 
     end
-    
+
     if sum(mdlBlkPath.nodesPerFloorLvl(:,2)) > 0
         noTLnodesDefined = false;
     else
@@ -447,7 +451,7 @@
 
         msgDisplayCount = displayDiagnostics(ErrorMsg="Added pipe network to supply coolant/heating fluid to building",ErrorMsgNum=msgDisplayCount,Diagnostics=NameValueArgs.Diagnostics);
     end
-    
+
     % Add connection between floors, through wall elements
     connectLevelThroughFloors(ListOfFloors=mdlBlkPath.blkNameFloorConn(:,1),...
                               listofLevels=mdlBlkPath.blkNameFloorLevel(:,1));
@@ -514,8 +518,6 @@
         simscape.addConnection(mdlBlkPath.nameArrayNodesInletBldg,"Amb",portA,"port","autorouting","off");
         simscape.addConnection(mdlBlkPath.nameArrayNodesOutletBldg,"Amb",portA,"port","autorouting","off");
     end
-    % simscape.addConnection(mdlBlkPath.blkNameFloorConn(topFloorLevelNum+1,1),"Top",portA,"port","autorouting","smart");
-    
 
     collateBuildingTemperatureData(CanvasPath=mdlBlkPath.libBuildingPath,...
         ConnectToBlock=mdlBlkPath.blkNameFloorLevel,ConnectToBlockPort="T",...
@@ -524,7 +526,7 @@
         BlockIndices=[(1:topFloorLevelNum)',ones(1,topFloorLevelNum)'],ConnectionOrder="reverse");
 
     displayDiagnostics(ErrorMsg="Collate temperature signals for all rooms of the building",ErrorMsgNum=msgDisplayCount,Diagnostics=NameValueArgs.Diagnostics);
-    
+
     % Rotate ports for main library block and add icon.
     hndl = get_param(mdlBlkPath.libBuildingPath,"PortHandles");
     if ~noTLnodesDefined

Components/WorkflowUtilities/BuildingCreator/SupportingFiles/addBlockConcatSignalPS.m

@@ -9,10 +9,17 @@
         NameValueArgs.NumberRoom (1,1) {mustBeNonnegative}
     end
 
-    theta = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom (1,1)).geometry.dim.theta;
-    if theta == 0
-        roomJvert = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom (1,1)).floorPlan.Vertices;
+    tht = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom).geometry.dim.theta;
+    if NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom).geometry.dim.floorPlanRotation == 0
+        len = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom).geometry.dim.length;
+        wid = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom).geometry.dim.width;
+        vrt = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom).geometry.dim.vertex;
+        roomModel = addNewRoomToFloorPlan(vrt,wid,len,tht,"Temp");
+        roomJvert = roomModel.floorPlan.Vertices;
     else
-        roomJvert = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom (1,1)).floorPlan.rotate(-theta).Vertices;
+        % Entire floor plan might have been rotated and hence this step
+        % (and not re-creating vertices as when tht is zero). The rotation
+        % vertex and the room vertex may not necessarily be the same.
+        roomJvert = NameValueArgs.Apartment.("apartment"+NameValueArgs.NumberApartment).("room"+NameValueArgs.NumberRoom).floorPlan.rotate(360-tht).Vertices;
     end
 end

Components/WorkflowUtilities/BuildingCreator/SupportingFiles/createBuildingComponentFromPartFile.m

@@ -51,7 +51,7 @@
                 saveBuildingLibrary(ModelName=NameValueArgs.BuildingLibraryName,...
                                     ModelData=buildingBlockLayout,...
                                     AddToProjectPath=true,...
-                                    AddIcon=false);
+                                    AddIcon=true);
             elseif NameValueArgs.SaveModel == "Create Model and Save"
                 saveBuildingLibrary(ModelName=NameValueArgs.BuildingLibraryName,...
                                     ModelData=buildingBlockLayout,...

Components/WorkflowUtilities/BuildingCreator/SupportingFiles/getNonRotatedRoomVertices.m

@@ -17,4 +17,5 @@
     roomModel.geometry.dim.width  = wid;
     roomModel.geometry.dim.vertex = vertex;
     roomModel.geometry.dim.theta  = theta;
+    roomModel.geometry.dim.floorPlanRotation = 0;
 end

Components/WorkflowUtilities/BuildingCreator/createBuildingLibraryAndParameterize.m

@@ -44,6 +44,7 @@
             end
             roomName   = NameValueArgs.Apartment.("room"+num2str(i)).name;
             roomModel  = addNewRoomToFloorPlan(vertex,width,length,theta,roomName);
+            roomModel.geometry.dim.floorPlanRotation = degVal;
             oneAptUnit = [oneAptUnit,roomModel];
         end
         newApartment = defineSingleApartmentUnit(Apartment=oneAptUnit,Tol=NameValueArgs.Tol);

Components/WorkflowUtilities/BuildingDesign/SupportingFiles/addNewRoomToFloorPlan.m

@@ -117,34 +117,4 @@
             dataStruct = addBackFloorPlanToRoom(dataStruct,i,j);
         end
     end
-
-    % % re-construct geoLocation()
-    % location = fileContent.README.Location;
-    % degLatitude = fileContent.README.Latitude;
-    % degLongitude = fileContent.README.Longitude;
-    % stdTimeZone = fileContent.README.StdTimeZone;
-    % geoLocation = table(degLatitude,degLongitude,stdTimeZone,...
-    %     'VariableNames',{'Latitude','Longitude','Meredian (Time Zone)'},...
-    %     'RowNames',location);
-    % 
-    % t1 = fileContent.README.StartTime;
-    % t2 = fileContent.README.EndTime;
-    % datetimeVec = t1:hours(1):t2;
-    % 
-    % disp(strcat('Location:',geoLocation.Row));
-    % disp('Simulation Duration:');
-    % disp(strcat('*** Start Time : ',string(datetimeVec(1,1))));
-    % disp(strcat('*** End Time   : ',string(datetimeVec(1,end))));
-    % % dateStringDisp = strcat(': ',string(datetimeVec(1,1)),' --> ',string(datetimeVec(1,end)));
-
-    % roomNameList = [];
-    % for j = 1:nRooms(1,1)
-    %     if j>1
-    %         roomNameList = strcat(dataStruct.apartment1.("room"+j).name,', ',roomNameList);
-    %     else
-    %         roomNameList = dataStruct.apartment1.("room"+j).name;
-    %     end
-    % end
-    % roomNameList = strcat("*** Room Names in Building : ",roomNameList);
-    % disp(roomNameList);
 end