Changeset 39

Timestamp:

04/24/09 13:58:52 (16 years ago)

Author:

Mathieu Morlighem

Message:

removedsparse2

Location:

issm/trunk/src/m/classes

Files:

• @acceleratedtriaelem/CreateKMatrix.m (modified) (3 diffs)
• @acceleratedtriaelem/CreatePVector.m (modified) (1 diff)
• public/ismodelselfconsistent.m (modified) (2 diffs)
• public/solve.m (modified) (1 diff)

issm/trunk/src/m/classes/@acceleratedtriaelem/CreateKMatrix.m

@@ -166 +166 @@
 end
 
-Drag_operator=sparse2(6*element.nods,6*element.nods);
+Drag_operator=sparse(6*element.nods,6*element.nods);
 
 %Create basal stiffness
@@ -228 +228 @@
         end  
 
-        Drag_operator=sparse2(row_location_drag,col_location_drag,drag_operator_value,6*element.nods,6*element.nods);
+        Drag_operator=sparse(row_location_drag,col_location_drag,drag_operator_value,6*element.nods,6*element.nods);
 end
 
@@ -234 +234 @@
 Ke=globalmatrix;
 Ke.nrows=numdof*element.nods;
-Ke.matrix=Drag_operator+sparse2(row_location,col_location,Ke_terms,6*element.nods,6*element.nods);
+Ke.matrix=Drag_operator+sparse(row_location,col_location,Ke_terms,6*element.nods,6*element.nods);

issm/trunk/src/m/classes/@acceleratedtriaelem/CreatePVector.m

@@ -69 +69 @@
 end
 
-Rhs=full([sparse2(row_rhs,ones(element.nel*27,1),Rhs_x,element.nods,1)
-   sparse2(row_rhs,ones(element.nel*27,1),Rhs_y,element.nods,1)]);
+Rhs=full([sparse(row_rhs,ones(element.nel*27,1),Rhs_x,element.nods,1)
+   sparse(row_rhs,ones(element.nel*27,1),Rhs_y,element.nods,1)]);
 
 %Index icefront is skipped: 

issm/trunk/src/m/classes/public/ismodelselfconsistent.m

@@ -371 +371 @@
         %SPARSITY BETWEEN 0 AND 1
         if ( (md.sparsity<=0) | (md.sparsity>1)),
-                disp(['model ' md.name ' sparsity should be inside the ]0 1] range']);
+                disp(['model ' md.name ' sparsity should be inside the [0 1] range']);
                 bool=0; return;
         end
@@ -400 +400 @@
 
         %NP
-        if md.np==0,
-                disp(['model ' md.name ' has a =0 value in field ' md.np ' !']);
-        elseif md.np<0,
-                disp(['model ' md.name ' has a negative value in field ' md.np ' !']);
+        if ~strcmpi(md.cluster,'none'),
+                if md.np==0,
+                        disp(['model ' md.name ' has a =0 value in field np !']);
+                elseif md.np<0,
+                        disp(['model ' md.name ' has a negative value in field np !']);
+                end
         end
 

issm/trunk/src/m/classes/public/solve.m

@@ -47 +47 @@
 %Use package to set solution namespace
 usenamespace(package);
-
 
 %Check model is self-consistent