Changeset 2095

Timestamp:

09/02/09 16:30:09 (15 years ago)

Author:

Mathieu Morlighem

Message:

fixed resultcheck

File:

• issm/trunk/src/m/classes/public/isresultconsistent.m (modified) (4 diffs)

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

@@ -26 +26 @@
 
 %DIAGNOSTIC
-if analysis_type==DiagnosticAnalysisEnum(),
+if analysis_type==DiagnosticAnalysisEnum() & md.control_analysis==0,
 
         if strcmpi(md.type,'3d')
@@ -59 +59 @@
 
 %CONTROL
-if analysis_type==ControlAnalysisEnum(),
-
-        fields1={'results.control.vx','results.control.vy','results.control.vel','results.control.parameter'};
-        fields2={'results.control.vel','results.control.J'};
+if analysis_type==DiagnosticAnalysisEnum() & md.control_analysis==1,
+
+        fields1={'results.diagnostic.vx','results.diagnostic.vy','results.diagnostic.vel','results.diagnostic.parameter'};
+        fields2={'results.diagnostic.vel','results.diagnostic.J'};
 
         %check size
@@ -86 +86 @@
         %check inversed parameter
         if ~isnan(md.maxcontrolconstraint),
-                if any(md.results.control.parameter>md.maxcontrolconstraint)
+                if any(md.results.diagnostic.parameter>md.maxdiagnosticconstraint)
                         disp(['''control'' result not consistent: inverse parameter is greater than ' num2str(md.maxcontrolconstraint)]);
                         bool=0; return; 
@@ -92 +92 @@
         end
         if ~isnan(md.mincontrolconstraint),
-                if any(md.results.control.parameter<md.mincontrolconstraint)
+                if any(md.results.diagnostic.parameter<md.mindiagnosticconstraint)
                         disp(['''control'' result not consistent: inverse parameter is smaller than ' num2str(md.mincontrolconstraint)]);
                         bool=0; return;