Changeset 972

Timestamp:

06/12/09 20:30:55 (16 years ago)

Author:

Eric.Larour

Message:

Include analysis_type in models. Swapped arguments for models and results in processresults

Location:

issm/trunk/src/m/solutions/cielo

Files:

• diagnostic.m (modified) (1 diff)
• modelsize.m (modified) (1 diff)
• processresults.m (modified) (1 diff)
• prognostic.m (modified) (1 diff)
• thermal.m (modified) (1 diff)
• transient3d.m (modified) (1 diff)

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

@@ -41 +41 @@
                 %process results
                 if ~isstruct(md.results), md.results=struct(); end
-                md.results.diagnostic=processresults(results,models);
+                md.results.diagnostic=processresults(models,results);
         else
                 %launch dakota driver for diagnostic core solution

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

@@ -13 +13 @@
 %get max dof
 for i=1:length(modelsname);
-        if ~isempty(models.(modelsname{i}).nodesets),
-                dof=max(dof,models.(modelsname{i}).nodesets.fsize);
+        if ~strcmpi(modelsname,'analysis_type'),
+                if ~isempty(models.(modelsname{i}).nodesets),
+                        dof=max(dof,models.(modelsname{i}).nodesets.fsize);
+                end
         end
 end

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

@@ -1 @@
-function newresults=processresults(results,models)
+function newresults=processresults(models,results)
 %PROCESSRESULTS - process results from core solution
 %

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

@@ -31 +31 @@
         displaystring(md.debug,'\n%s',['load results...']);
         if ~isstruct(md.results), md.results=struct(); end
-        md.results.prognostic=processresults(results,models);
+        md.results.prognostic=processresults(models, results);
 
         %stop timing

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

@@ -32 +32 @@
         %plug onto the model
         if ~isstruct(md.results), md.results=struct(); end
-        md.results.thermal=processresults(results,models);
+        md.results.thermal=processresults(models,results);
 
         %stop timing

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

@@ -139 +139 @@
 %process results
 if ~isstruct(md.results), md.results=struct(); end
-md.results.transient=processresults(results,models);
+md.results.transient=processresults(models, results);