Materials db converted into cell array for faster access (#73)

Author: danielemoretto44

Code/discretizer/PhysicsSolver.m

@@ -162,7 +162,7 @@ function applyNeuBC(obj,bcId,bcDofs,bcVals)
       bcVar = obj.domain.bcs.getVariable(bcId);
       bcId = obj.domain.dofm.getVariableId(bcVar);
 
-      % remove inactive dofs
+      %remove inactive dofs
       id = bcDofs == 0;
       bcDofs = bcDofs(~id);
       bcVals = bcVals(~id);
@@ -218,7 +218,7 @@ function applyDirBC(obj,bcId,bcDofs,bcVals)
         for i = 1:nV
           obj.domain.J{i,bcVarId}(:,bcDofs) = 0;
         end
-      
+
         for iI = 1:numel(obj.domain.interfaces)
           if ~isempty(obj.domain.Jum{bcVarId})
             obj.domain.Jmu{iI}{bcVarId}(:,bcDofs) = 0;
@@ -241,6 +241,8 @@ function applyDirBC(obj,bcId,bcDofs,bcVals)
 
     end
 
+
+
     function J = getJacobian(obj,varargin)
 
       % get the Jacobian blocks affected by the solver
@@ -263,7 +265,7 @@ function applyDirBC(obj,bcId,bcDofs,bcVals)
       out = any(strcmp(obj.getField(),bcVar));
 
     end
-    
+
 
     function out = isSymmetric(obj)
 

Code/integratedTest/MortarConvergence/poissonMortar.xml

@@ -11,7 +11,7 @@
     </simParam>
     <Domain>
         <Geometry>
-            <fileName>Input/Mesh/meshes/domain_hexa27_2.vtk</fileName>
+            <fileName>Input\Mesh\meshes\domain_hexa27_2.vtk</fileName>
         </Geometry>
         <Gauss>
             <nGP>3</nGP>
@@ -35,7 +35,7 @@
                 <surfaceTag>3</surfaceTag>
             </Slave>
             <Quadrature>
-                <type>ElementBasedQuadrature</type>
+                <type>RBFquadrature</type>
                 <nGP>6</nGP>
                 <nInt>5</nInt>
             </Quadrature>

Code/materials/Materials.m

@@ -2,10 +2,7 @@
   % MATERIAL - General material class
 
   properties (Access = public)
-    % Creation of a Dictionary object (faster than map)
-    %db = configureDictionary("double","struct");
-    % configureDictionary is not supported before 2023b
-    db
+    db 
     matMap
   end
 
@@ -17,7 +14,7 @@
         return
       end
 
-      obj.db = containers.Map('KeyType','double','ValueType','any');
+      obj.db = cell([]);
       % Calling the function to read input data from file
       obj.readInputFile(input);
     end
@@ -29,7 +26,7 @@
       % The preliminary check whether matID is key of db has been commented
       % since it is highly expensive
       %       if (obj.db.isKey(matID))
-      mat = obj.db(obj.matMap(cellTag));
+      mat = obj.db{obj.matMap(cellTag)};
       %       else
       %       Displaying error message if matIdentifier is not a key
       %       of the map
@@ -39,7 +36,7 @@
 
     function fluidMat = getFluid(obj)
       % fluid material is always stored as the last one in the database
-      fluidMat = obj.db(max(cell2mat(keys(obj.db))));
+      fluidMat = obj.db{end};
     end
 
     function [status] = initializeStatus(obj,cTag,sigma)
@@ -120,7 +117,7 @@ function readInputFile(obj, input)
               mat.Curves.betaCorrection(getSpecificWeight(fluid));
             end
           end
-          obj.db(i) = mat;
+          obj.db{i} = mat;
         end
       end
 
@@ -132,7 +129,7 @@ function readInputFile(obj, input)
       end
 
       if isfield(input,"Fluid")
-        obj.db(nSolid+1) = fluid;
+        obj.db{nSolid+1} = fluid;
       end
 
     end