Changeset 4102 for issm/trunk/src/m/solutions/jpl/steadystate.m

Timestamp:

06/21/10 16:37:39 (15 years ago)

Author:

seroussi

Message:

changes .m solutions, transient missing

File:

• issm/trunk/src/m/solutions/jpl/steadystate.m (modified) (1 diff)

issm/trunk/src/m/solutions/jpl/steadystate.m

@@ -9 +9 @@
         t1=clock;
 
-        models.analysis_type=SteadystateAnalysisEnum; %needed for processresults
-        
-        %Build all models requested for diagnostic simulation
-        displaystring(md.verbose,'%s',['reading diagnostic horiz model data']);
-        md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=HorizAnalysisEnum; models.dh=CreateFemModel(md);
-        
-        displaystring(md.verbose,'\n%s',['reading diagnostic vert model data']);
-        md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=VertAnalysisEnum; models.dv=CreateFemModel(md);
-        
-        displaystring(md.verbose,'\n%s',['reading diagnostic stokes model data']);
-        md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=StokesAnalysisEnum; models.ds=CreateFemModel(md);
-        
-        displaystring(md.verbose,'\n%s',['reading diagnostic hutter model data']);
-        md.analysis_type=DiagnosticAnalysisEnum; md.sub_analysis_type=HutterAnalysisEnum; models.dhu=CreateFemModel(md);
-        
-        displaystring(md.verbose,'\n%s',['reading surface and bed slope computation model data']);
-        md.analysis_type=SlopecomputeAnalysisEnum; md.sub_analysis_type=NoneAnalysisEnum; models.sl=CreateFemModel(md);
+        analysis_types=[DiagnosticHorizAnalysisEnum,DiagnosticVertAnalysisEnum,DiagnosticStokesAnalysisEnum,DiagnosticHutterAnalysisEnum,SlopeAnalysisEnum,ThermalAnalysisEnum,MeltingAnalysisEnum];
+        solution_type=SteadyStateAnalysisEnum;
 
-        %Build all models requested for thermal simulation
-        displaystring(md.verbose,'%s',['reading thermal model data']);
-        md.analysis_type=ThermalAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.t=CreateFemModel(md);
+        displaystring(md.verbose,'%s',['create finite element model']);
+        femmodel=NewFemModel(md,solution_type,analysis_types);
 
-        displaystring(md.verbose,'%s',['reading melting model data']);
-        md.analysis_type=MeltingAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.m=CreateFemModel(md);
-
-        % figure out number of dof: just for information purposes.
-        md.dof=modelsize(models);
-
-        %initialize inputs
-        displaystring(md.verbose,'\n%s',['setup inputs...']);
-        inputs=inputlist;
-        inputs=add(inputs,'velocity',models.dh.parameters.u_g,'doublevec',3,models.dh.parameters.NumberOfNodes);
-        inputs=add(inputs,'pressure',models.t.parameters.p_g,'doublevec',1,models.t.parameters.NumberOfNodes);
-        inputs=add(inputs,'dt',models.t.parameters.Dt*models.t.parameters.Yts,'double');
-        if md.control_analysis,
-                inputs=add(inputs,'velocity_obs',models.dh.parameters.u_g_obs,'doublevec',2,models.dh.parameters.NumberOfNodes);
-                inputs=add(inputs,'weights',models.dh.parameters.Weights,'doublevec',1,models.dh.parameters.NumberOfNodes);
-        end
+        %retrieve parameters
+        verbose=femmodel.parameters.Verbose;
+        qmu_analysis=femmodel.parameters.QmuAnalysis;
+        control_analysis=femmodel.parameters.ControlAnalysis;
         
         %compute solution
-        if ~models.dh.parameters.QmuAnalysis,
-                if md.control_analysis,
-                        %change control_steady to 1
-                        models.dh.parameters.ControlSteady=1;
-                        models.ds.parameters.ControlSteady=1;
-                        %launch core of control solution.
-                        results=control_core(models);
+        if ~qmu_analysis,
+                if ~control_analysis,
+                        
+                        displaystring(verbose,'%s',['call computational core']);
+                        steadystate_core(femmodel);
 
-                        %process results
-                        if ~isstruct(md.results), md.results=struct(); end
-                        md.results.SteadystateAnalysis=processresults(models,results);
                 else,
-                        %launch core of steadystate solution.
-                        results=steadystate_core(models);
-                
-                        %process results
-                        if ~isstruct(md.results), md.results=struct(); end
-                        md.results.SteadystateAnalysis=processresults(models,results);
+                        
+                        displaystring(verbose,'%s',['call computational core']);
+                        control_core(femmodel);
+
                 end
         else
-                %launch dakota driver for steadystate core solution
-                Qmu(models,models.dh.parameters);
+                %launch dakota driver for diagnostic core solution
+                Qmu(femmodel);
         end