Changeset 971

Timestamp:

06/12/09 20:22:19 (16 years ago)

Author:

Eric.Larour

Message:

Folded analysis_type into models

Location:

issm/trunk/src/m/solutions/cielo

Files:

• diagnostic.m (modified) (2 diffs)
• processresults.m (modified) (2 diffs)
• prognostic.m (modified) (2 diffs)
• thermal.m (modified) (2 diffs)
• transient2d.m (modified) (1 diff)
• transient3d.m (modified) (2 diffs)

issm/trunk/src/m/solutions/cielo/diagnostic.m

@@ -10 +10 @@
 
         %Build all models requested for diagnostic simulation
+        models.analysis_type='diagnostic'; %needed for processresults
+        
         displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
         md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; models.dh=CreateFemModel(md);
@@ -39 +41 @@
                 %process results
                 if ~isstruct(md.results), md.results=struct(); end
-                md.results.diagnostic=processresults(results,models,'diagnostic');
+                md.results.diagnostic=processresults(results,models);
         else
                 %launch dakota driver for diagnostic core solution

issm/trunk/src/m/solutions/cielo/processresults.m

@@ -1 @@
-function newresults=processresults(results,models,analysis_type);
+function newresults=processresults(results,models)
 %PROCESSRESULTS - process results from core solution
 %
@@ -10 +10 @@
 %initialize output
 newresults=struct();
+
+%get analysis_type:
+analysis_type=models.analysis_type;
 
 %recover models first

issm/trunk/src/m/solutions/cielo/prognostic.m

@@ -9 +9 @@
 
         %Build all models requested for diagnostic simulation
+        models.analysis_type='prognostic'; %needed for processresults
+        
         displaystring(md.debug,'%s',['reading prognostic model data']);
         md.analysis_type='prognostic'; models.p=CreateFemModel(md);
@@ -29 +31 @@
         displaystring(md.debug,'\n%s',['load results...']);
         if ~isstruct(md.results), md.results=struct(); end
-        md.results.prognostic=processresults(results,models,'prognostic');
+        md.results.prognostic=processresults(results,models);
 
         %stop timing

issm/trunk/src/m/solutions/cielo/thermal.m

@@ -7 +7 @@
         %timing
         t1=clock;
+        
+        models.analysis_type='thermal'; %needed for processresults
 
         %Build all models requested for diagnostic simulation
@@ -30 +32 @@
         %plug onto the model
         if ~isstruct(md.results), md.results=struct(); end
-        md.results.thermal=processresults(results,models,'thermal');
+        md.results.thermal=processresults(results,models);
 
         %stop timing

issm/trunk/src/m/solutions/cielo/transient2d.m

@@ -8 +8 @@
 
 %Build all models requested
+models.analysis_type='transient'; %needed for processresults
+
 displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
 md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; models.dh=CreateFemModel(md);

issm/trunk/src/m/solutions/cielo/transient3d.m

@@ -8 +8 @@
 
 %Build all models related to diagnostic
+models.analysis_type='transient'; %needed for processresults
+
 displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
 md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; models.dh=CreateFemModel(md);
@@ -137 +139 @@
 %process results
 if ~isstruct(md.results), md.results=struct(); end
-md.results.transient=processresults(results,models,'transient');
+md.results.transient=processresults(results,models);