With updated plot utilities (#70)

Author: danielemoretto44

Code/output/OutState.m

@@ -86,19 +86,24 @@
 
         opt = struct(varargin{:});
         if isfield(opt, 'flagMatFile'), obj.writeSolution = logical(opt.flagMatFile); end
-        if isfield(opt, 'writeVtk'),    obj.writeVtk    = logical(opt.writeVtk);    end
-        if isfield(opt, 'folderName'),  obj.vtkFileName  = string(opt.folderName);   end
+        if isfield(opt, 'folderName')
+          obj.vtkFileName  = string(opt.folderName);
+          obj.writeVtk = true;
+        end
         if isfield(opt, 'matFileName'),  obj.matFileName  = string(opt.matFileName);   end
         if isfield(opt, 'timeList'),    tList       = opt.timeList;             end
+
       end
 
       % ------------------------------------------------------------
       % Object setup
       % ------------------------------------------------------------
 
+
       % Time list handling
       if obj.writeVtk
         % vtm file document node
+        obj.vtkFile = com.mathworks.xml.XMLUtils.createDocument('VTKFile');
         assert(~isempty(tList), ...
           "Print times have not been specified for output.");
       end
@@ -258,8 +263,6 @@ function createVTKFolder(obj)
       % Merge output variable coming from a field to the global output
       % structure
       % Concatenate the two structure arrays
-      strA = reshape(strA,[],1);
-      strB = reshape(strB,[],1);
 
       if isempty(strA)
         mergeStruct = strB;

Code/unittest/Mesh/testMesh.m

@@ -10,6 +10,23 @@ function testReadVTK(testCase)
       testCase.verifyEqual(mesh.nCells,560);
       testCase.verifyEqual(mesh.nSurfaces,624);
     end
+
+    function testStructuredGrids(testCase)
+      mesh = structuredMesh(5,5,5,[0 1],[0 1],[0 1]);
+      testCase.verifyEqual(mesh.nCells,5^3);
+      testCase.verifyEqual(mesh.nNodes,6^3);
+      testCase.verifyEqual(mesh.cells(2,:),[2	3	9	8	38	39	45	44]);
+
+      b = BlockStructuredMesh(2,2,2,[0 1],[0 1],[0 1],3);
+      b.refineRecursive([1 1 1],2);
+      b.refineRecursive([2 2 2],2);
+      b.refineRecursive([2 1 2],1);
+      mesh =b.processGeometry();
+      testCase.verifyEqual(mesh.nNodes,305);
+      testCase.verifyEqual(mesh.nDim,3);
+      testCase.verifyEqual(mesh.nCells,141);
+      testCase.verifyEqual(mesh.cells(10,:),[28	32	33	29	30	34	35	31]);
+    end
    end
 
 

Tutorial/meshInput/meshIO.mlx

@@ -1,23 +1,42 @@
-function  plotFunction(mesh, foldName, funct, varargin)
+function  plotFunction(mesh, foldName, time, funct, varargin)
 % PLOTFUNCTION Summary of this function goes here
 %   Detailed explanation goes here
-outVTK = VTKOutput(mesh, foldName); % create VTK object
-pointData.name = 'solution';
-pointData.data = funct;
-outVTK.writeVTKFile(0, [], [], [], []);
+
+out = OutState('folderName',foldName,'timeList',time);
+out.prepareOutputFolders();
+
+[~, vtuName, ~] = fileparts(foldName);
+
+toc = out.vtkFile.getDocumentElement;
+toc.setAttribute('type', 'vtkMultiBlockDataSet');
+toc.setAttribute('version', '1.0');
+blocks = out.vtkFile.createElement('vtkMultiBlockDataSet');
+
+
+% inner block with vtu dataset to append to vtm file
+block = out.vtkFile.createElement('Block');
+
+var.name = 'solution';
+var.data = funct;
+% outVTK.writeVTKFile(0, [], [], [], []);
 if isempty(varargin) || strcmpi(varargin{1},'node')
-   if ~isempty(mesh.cells)
-      outVTK.writeVTKFile(0, pointData, [], [], []);
-   else
-      outVTK.writeVTKFile(0, [], [], pointData, []);
-   end
+  if ~isempty(mesh.cells)
+    writeVTKfile(out,block,vtuName,mesh,time,var,[],[],[]);
+  else
+    writeVTKfile(out,block,vtuName,mesh,time,[],[],var,[]);
+  end
 elseif strcmpi(varargin{1},'elem')
-   if ~isempty(mesh.cells)
-      outVTK.writeVTKFile(0, [], pointData, [], []);
-   else
-      outVTK.writeVTKFile(0, [], [], [], pointData);
-   end
+  if ~isempty(mesh.cells)
+    writeVTKfile(out,block,vtuName,mesh,time,[],var,[],[]);
+  else
+    writeVTKfile(out,block,vtuName,mesh,time,[],[],[],var);
+  end
 end
-   outVTK.finalize()
+
+blocks.appendChild(block);
+toc.appendChild(blocks);
+
+out.writeVTMFile();
+
 end
 

Utilities/ParaviewPlot/plotFunction.m

@@ -1,10 +1,5 @@
 function  plotMesh(mesh, foldName)
-% PLOTFUNCTION Summary of this function goes here
-%   Detailed explanation goes here
-outVTK = VTKOutput(mesh, foldName); % create VTK object
-pointData.name = 'field';
-pointData.data = zeros(mesh.nNodes,1);
-outVTK.writeVTKFile(0, pointData, [], [], []);
-outVTK.finalize()
+
+plotFunction(mesh,foldName,0.0,zeros(mesh.nNodes,1))
 end