Changeset 11577 for issm/branches/trunk-jpl-damage/src/m/classes/model/model.m

Timestamp:

02/29/12 13:35:30 (13 years ago)

Author:

cborstad

Message:

merged changes up to r11576 from trunk-jpl into branch

Location:

issm/branches/trunk-jpl-damage

Files:

• . (modified) (2 props)
• src/m (modified) (1 prop)
• src/m/classes (modified) (1 prop)
• src/m/classes/model (modified) (1 prop)
• src/m/classes/model/model.m (modified) (2 diffs)

issm/branches/trunk-jpl-damage

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog

issm/branches/trunk-jpl-damage/src/m/classes/model/model.m

@@ -136 +136 @@
                          if isfield(structmd,'melting_rate'), md.basalforcings.melting_rate=structmd.melting_rate; end
                          if isfield(structmd,'accumulation'), md.surfaceforcings.mass_balance=structmd.accumulation; end
-                         if isfield(structmd,'accumulation_rate'), md.surfaceforcings.mass_balance=structmd.accumulation_rate; end
                          if isfield(structmd,'numberofgrids'), md.mesh.numberofvertices=structmd.numberofgrids; end
                          if isfield(structmd,'numberofgrids2d'), md.mesh.numberofvertices2d=structmd.numberofgrids2d; end
@@ -406 +405 @@
                          md.settings         = settings();
                          md.solver           = solver();
-                         md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions);
+                         if ismumps,
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,mumpsoptions);
+                         else
+                                 md.solver           = addoptions(md.solver,DiagnosticVertAnalysisEnum,iluasmoptions);
+                         end
                          md.cluster          = none();
                          md.balancethickness = balancethickness();

@@ -17 +17 @@
 stamp-h1
 svn-commit*
+nightlylog