Changeset 12878 for issm/branches/trunk-jpl-damage/src/m/classes/solver.m

Timestamp:

08/02/12 17:13:12 (13 years ago)

Author:

cborstad

Message:

merged trunk-jpl into trunk-jpl-damage through revision 12877

Location:

issm/branches/trunk-jpl-damage

Files:

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

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

@@ -18 +18 @@
                                  end
                          end % }}}
-                 function obj = addoptions(obj,analysis,varargin) % {{{1
+                 function obj = addoptions(obj,analysis,varargin) % {{{
                  % Usage example:
                  %    md.solver=addoptions(md.solver,DiagnosticHorizAnalysisEnum,stokesoptions());
@@ -54 +54 @@
                          end
                  end % }}}
-                 function checkconsistency(obj,md,solution,analyses) % {{{
+                 function md = checkconsistency(obj,md,solution,analyses) % {{{
                          analyses=properties(obj);
                          for i=1:numel(analyses),
                                  if isempty(fieldnames(obj.(analyses{i})))
-                                         checkmessage(['md.solver.' analyses{i} ' is empty']);
+                                         md = checkmessage(md,['md.solver.' analyses{i} ' is empty']);
                                  end
                          end