Changeset 922 for issm/trunk/src/m/solutions/cielo/diagnostic.m

Timestamp:

06/11/09 15:53:37 (16 years ago)

Author:

Eric.Larour

Message:

reworked diagnostic core to more resemble parallel core

File:

• issm/trunk/src/m/solutions/cielo/diagnostic.m (modified) (1 diff)

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

@@ -11 +11 @@
         %Build all models requested for diagnostic simulation
         displaystring(md.debug,'%s',['reading diagnostic horiz model data']);
-        md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; m_dh=CreateFemModel(md);
+        md.analysis_type='diagnostic'; md.sub_analysis_type='horiz'; models.dh=CreateFemModel(md);
         
         displaystring(md.debug,'\n%s',['reading diagnostic vert model data']);
-        md.analysis_type='diagnostic'; md.sub_analysis_type='vert'; m_dv=CreateFemModel(md);
+        md.analysis_type='diagnostic'; md.sub_analysis_type='vert'; models.dv=CreateFemModel(md);
         
         displaystring(md.debug,'\n%s',['reading diagnostic stokes model data']);
-        md.analysis_type='diagnostic'; md.sub_analysis_type='stokes'; m_ds=CreateFemModel(md);
+        md.analysis_type='diagnostic'; md.sub_analysis_type='stokes'; models.ds=CreateFemModel(md);
 
         displaystring(md.debug,'\n%s',['reading diagnostic hutter model data']);
-        md.analysis_type='diagnostic'; md.sub_analysis_type='hutter'; m_dhu=CreateFemModel(md);
+        md.analysis_type='diagnostic'; md.sub_analysis_type='hutter'; models.dhu=CreateFemModel(md);
         
         displaystring(md.debug,'\n%s',['reading surface and bed slope computation model data']);
-        md.analysis_type='slope_compute'; md.sub_analysis_type=''; m_sl=CreateFemModel(md);
+        md.analysis_type='slope_compute'; md.sub_analysis_type=''; models.sl=CreateFemModel(md);
         
         % figure out number of dof: just for information purposes.
-        md.dof=modelsize(m_dh,m_dv,m_ds,m_dhu,m_sl);
+        md.dof=modelsize(models);
 
         %initialize inputs
         inputs=inputlist;
-        inputs=add(inputs,'velocity',m_dh.parameters.u_g,'doublevec',3,m_dh.parameters.numberofnodes);
+        inputs=add(inputs,'velocity',models.dh.parameters.u_g,'doublevec',3,models.dh.parameters.numberofnodes);
 
         %compute solution
-        [u_g,p_g]=diagnostic_core(m_dh,m_dhu,m_dv,m_ds,m_sl,inputs);
+        results=diagnostic_core(models,inputs);
 
-        %Load results onto model
-        md=loadresults(md,u_g,p_g,m_dh,m_ds,m_dhu);
+        %load results onto model
+        md=loadresults(md,models,results);
 
         %stop timing