Changeset 9705

Timestamp:

09/08/11 17:00:24 (14 years ago)

Author:

Mathieu Morlighem

Message:

Added mesh class to be populated

Location:

issm/trunk

Files:

• src/c/EnumDefinitions/EnumDefinitions.h (modified) (2 diffs)
• src/c/modules/EnumToStringx/EnumToStringx.cpp (modified) (2 diffs)
• src/c/modules/ModelProcessorx/CreateParameters.cpp (modified) (1 diff)
• src/c/modules/StringToEnumx/StringToEnumx.cpp (modified) (2 diffs)
• src/c/modules/SystemMatricesx/SystemMatricesx.cpp (modified) (1 diff)
• src/m/classes/mesh.m (added)
• src/m/classes/model/model.m (modified) (5 diffs)
• src/m/enum/MeshAverageVertexConnectivityEnum.m (added)
• src/m/model/collapse.m (modified) (1 diff)
• src/m/model/extrude.m (modified) (1 diff)
• src/m/model/ismodelselfconsistent.m (modified) (1 diff)
• test/Miscellaneous/Bump/Bump.par (modified) (1 diff)
• test/Miscellaneous/connectivity/runme.m (modified) (1 diff)
• test/Par/ISMIPF.par (modified) (1 diff)

issm/trunk/src/c/EnumDefinitions/EnumDefinitions.h

@@ -147 +147 @@
         AutodiffForwardEnum,
         AutodiffReverseEnum,
+        MeshAverageVertexConnectivityEnum,
         /*}}}*/
         /*Datasets {{{1*/
@@ -409 +410 @@
         Gradient3Enum,
         OldGradientEnum,
-        ConnectivityEnum,
         ControlSteadyEnum,
         DimEnum,

issm/trunk/src/c/modules/EnumToStringx/EnumToStringx.cpp

@@ -151 +151 @@
                 case AutodiffForwardEnum : return "AutodiffForward";
                 case AutodiffReverseEnum : return "AutodiffReverse";
+                case MeshAverageVertexConnectivityEnum : return "MeshAverageVertexConnectivity";
                 case ConstraintsEnum : return "Constraints";
                 case ElementsEnum : return "Elements";
@@ -361 +362 @@
                 case Gradient3Enum : return "Gradient3";
                 case OldGradientEnum : return "OldGradient";
-                case ConnectivityEnum : return "Connectivity";
                 case ControlSteadyEnum : return "ControlSteady";
                 case DimEnum : return "Dim";

issm/trunk/src/c/modules/ModelProcessorx/CreateParameters.cpp

@@ -46 +46 @@
         parameters->AddObject(iomodel->CopyConstantObject(ThermalPenaltyFactorEnum));
         parameters->AddObject(iomodel->CopyConstantObject(SettingsLowmemEnum));
-        parameters->AddObject(iomodel->CopyConstantObject(ConnectivityEnum));
+        parameters->AddObject(iomodel->CopyConstantObject(MeshAverageVertexConnectivityEnum));
         parameters->AddObject(iomodel->CopyConstantObject(ConstantsReferencetemperatureEnum));
         parameters->AddObject(iomodel->CopyConstantObject(BalancethicknessStabilizationEnum));

issm/trunk/src/c/modules/StringToEnumx/StringToEnumx.cpp

@@ -149 +149 @@
         else if (strcmp(name,"AutodiffForward")==0) return AutodiffForwardEnum;
         else if (strcmp(name,"AutodiffReverse")==0) return AutodiffReverseEnum;
+        else if (strcmp(name,"MeshAverageVertexConnectivity")==0) return MeshAverageVertexConnectivityEnum;
         else if (strcmp(name,"Constraints")==0) return ConstraintsEnum;
         else if (strcmp(name,"Elements")==0) return ElementsEnum;
@@ -359 +360 @@
         else if (strcmp(name,"Gradient3")==0) return Gradient3Enum;
         else if (strcmp(name,"OldGradient")==0) return OldGradientEnum;
-        else if (strcmp(name,"Connectivity")==0) return ConnectivityEnum;
         else if (strcmp(name,"ControlSteady")==0) return ControlSteadyEnum;
         else if (strcmp(name,"Dim")==0) return DimEnum;

issm/trunk/src/c/modules/SystemMatricesx/SystemMatricesx.cpp

@@ -32 +32 @@
         parameters->FindParam(&analysis_type,AnalysisTypeEnum);
         parameters->FindParam(&configuration_type,ConfigurationTypeEnum);
-        parameters->FindParam(&connectivity,ConnectivityEnum);
+        parameters->FindParam(&connectivity,MeshAverageVertexConnectivityEnum);
 
         /*Get size of matrices: */

issm/trunk/src/m/classes/model/model.m

@@ -39 +39 @@
                  initialization   = modelfield('default',0,'marshall',true);
                  geometry         = modelfield('default',0,'marshall',true);
+                 mesh             = modelfield('default',0,'marshall',true);
 
                  %FIXME: all other fields should belong to other classes
@@ -89 +90 @@
                  %Boundary conditions
                  nodeonboundary = modelfield('default',NaN,'marshall',false);
-
-                 %Statics parameters
-                 connectivity             = modelfield('default',0,'marshall',true,'format','Integer');
                  %}}}
          end
@@ -331 +329 @@
                          if isfield(structmd,'bathymetry'), md.geometry.bathymetry=structmd.bathymetry; end
                          if isfield(structmd,'thickness_coeff'), md.geometry.hydrostatic_ratio=structmd.thickness_coeff; end
+                         if isfield(structmd,'connectivity'), md.mesh.average_vertex_connectivity=structmd.connectivity; end
 
                          %Field changes
@@ -412 +411 @@
                  end% }}}
                  function md = setdefaultparameters(md) % {{{1
-                 %SETDEFAULTPARAMETERS - plug default parameters onto model
-                 %
-                 %   Although the model parameterization should be done in
-                 %   the parameter file, some parameters are initialized here
-                 %   with a default value.
-                 %   These default values can be changed if necessary.
-                 %
-                 %   Usage:
-                 %      md=setdefaultparameters(md);
 
                          %first, use the defaults provided by the properties definition above. 
@@ -462 +452 @@
                          md.geometry         = geometry;
                          md.verbose          = verbose('solution',true,'qmu',true,'control',true);
-
-                         %the connectivity is the avergaded number of nodes linked to a
-                         %given node through an edge. This connectivity is used to initially
-                         %allocate memory to the stiffness matrix. A value of 16 seems to
-                         %give a good memory/time ration. This value can be checked in
-                         %trunk/test/Miscellaneous/runme.m
-                         md.connectivity=25;
+                         md.mesh             = mesh;
                  end
                  %}}}

issm/trunk/src/m/model/collapse.m

@@ -73 +73 @@
 
 %update of connectivity matrix
-md.connectivity=25;
+md.mesh.average_vertex_connectivity=25;
 
 %Collapse the mesh

issm/trunk/src/m/model/extrude.m

@@ -223 +223 @@
 
 %increase connectivity if less than 25:
-if md.connectivity<=25,
-        md.connectivity=100;
-end
+if md.mesh.average_vertex_connectivity<=25,
+        md.mesh.average_vertex_connectivity=100;
+end

issm/trunk/src/m/model/ismodelselfconsistent.m

@@ -188 +188 @@
 %CONNECTIVITY {{{1
 if (md.dim==2),
-        if md.connectivity<9, 
+        if md.mesh.average_vertex_connectivity<9, 
                 message('model not consistent: connectivity should be at least 9 for 2d models');
         end
 end
 if md.dim==3,
-        if md.connectivity<24, 
+        if md.mesh.average_vertex_connectivity<24, 
                 message('model not consistent: connectivity should be at least 24 for 3d models');
         end

issm/trunk/test/Miscellaneous/Bump/Bump.par

@@ -33 +33 @@
 %Parallel options
 md.settings.waitonlock=1;
-md.connectivity=100;
+md.average_vertex_connectivity=100;

issm/trunk/test/Miscellaneous/connectivity/runme.m

@@ -36 +36 @@
                 md=setmask(md,'all','');
                 md=parameterize(md,'Square.par');
-                md.connectivity=connectivity;
+                md.average_vertex_connectivity=connectivity;
                 md.np=np;
                 if is3d,

issm/trunk/test/Par/ISMIPF.par

@@ -37 +37 @@
 
 %Parallel options
-md.connectivity=200;
+md.average_vertex_connectivity=200;
 
 %Transient options