Changeset 3085

Timestamp:

02/23/10 11:04:17 (15 years ago)

Author:

seroussi

Message:

added core in slopecompute in serial

Location:

issm/trunk/src/m/solutions/jpl

Files:

• ControlInitialization.m (modified) (1 diff)
• diagnostic.m (modified) (1 diff)
• diagnostic_core.m (modified) (3 diffs)
• slopecompute.m (modified) (2 diffs)
• slopecompute_core.m (added)
• steadystate.m (modified) (1 diff)
• transient2d.m (modified) (1 diff)
• transient3d.m (modified) (1 diff)

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

@@ -25 +25 @@
 %compute slopes
 displaystring(verbose,'\n%s',['computing bed slope (x and y derivatives)...']);
-slopex=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum());
-slopey=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum());
+slopex=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum());
+slopey=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum());
 slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopex,'slopex',0);
 slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopey,'slopey',0);

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

@@ -24 +24 @@
         
         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);
+        md.analysis_type=SlopecomputeAnalysisEnum; md.sub_analysis_type=NoneAnalysisEnum; models.sl=CreateFemModel(md);
         
         % figure out number of dof: just for information purposes.

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

@@ -26 +26 @@
 
         displaystring(verbose,'\n%s',['computing surface slope (x and y derivatives)...']);
-        slopex=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceXAnalysisEnum());
-        slopey=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),SurfaceYAnalysisEnum());
+        slopex=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),SurfaceXAnalysisEnum());
+        slopey=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),SurfaceYAnalysisEnum());
 
         if dim==3,
@@ -85 +85 @@
 
                 displaystring(verbose,'\n%s',['computing bed slope (x and y derivatives)...']);
-                slopex=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedXAnalysisEnum());
-                slopey=diagnostic_core_linear(m_sl,inputs,SlopeComputeAnalysisEnum(),BedYAnalysisEnum());
+                slopex=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedXAnalysisEnum());
+                slopey=diagnostic_core_linear(m_sl,inputs,SlopecomputeAnalysisEnum(),BedYAnalysisEnum());
                 slopex=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopex,'slopex',0);
                 slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,m_sl.parameters,slopey,'slopey',0);
@@ -112 +112 @@
         end
 end
-
 %load onto results
 results.step=1;

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

@@ -9 +9 @@
 
         %Build all models requested for diagnostic simulation
-        models.analysis_type=SlopeComputeAnalysisEnum; %needed for processresults
+        models.analysis_type=SlopecomputeAnalysisEnum; %needed for processresults
 
         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);
+        md.analysis_type=SlopecomputeAnalysisEnum; md.sub_analysis_type=NoneAnalysisEnum; models.sl=CreateFemModel(md);
         
         % figure out number of dof: just for information purposes.
@@ -22 +22 @@
         %compute solution
         displaystring(md.verbose,'\n%s',['call computational core:']);
-        slopex=diagnostic_core_linear(models.sl,inputs,SlopeComputeAnalysisEnum(),SurfaceXAnalysisEnum());
-        slopey=diagnostic_core_linear(models.sl,inputs,SlopeComputeAnalysisEnum(),SurfaceYAnalysisEnum());
+        results=slopecompute_core(models,inputs,SlopecomputeAnalysisEnum(),NoneAnalysisEnum());
 
-        results.slopex=slopex;
-        results.slopey=slopey;
-        results.step=1;
-        results.time=0;
-        
         displaystring(md.verbose,'\n%s',['load results...']);
         if ~isstruct(md.results), md.results=struct(); end

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

@@ -25 +25 @@
         
         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);
+        md.analysis_type=SlopecomputeAnalysisEnum; md.sub_analysis_type=NoneAnalysisEnum; models.sl=CreateFemModel(md);
 
         %Build all models requested for thermal simulation

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

@@ -23 +23 @@
 
 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);
+md.analysis_type=SlopecomputeAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.sl=CreateFemModel(md);
 
 displaystring(md.verbose,'%s',['reading prognostic model data']);

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

@@ -23 +23 @@
 
 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);
+md.analysis_type=SlopecomputeAnalysisEnum(); md.sub_analysis_type=NoneAnalysisEnum(); models.sl=CreateFemModel(md);
 
 displaystring(md.verbose,'%s',['reading prognostic model data']);