Changeset 1654

Timestamp:

08/12/09 09:56:22 (16 years ago)

Author:

Mathieu Morlighem

Message:

fixed Enum problem

Location:

issm/trunk/src/m/solutions/cielo

Files:

• ControlInitialization.m (modified) (1 diff)
• diagnostic_core.m (modified) (1 diff)

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

@@ -25 +25 @@
 %compute slopes
 displaystring(debug,'\n%s',['computing bed slope (x and y derivatives)...']);
-slopex=diagnostic_core_linear(m_sl,inputs,'slope_compute','bedx');
-slopey=diagnostic_core_linear(m_sl,inputs,'slope_compute','bedy');
+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,slopex,'slopex',0);
 slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey,'slopey',0);

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

@@ -82 +82 @@
 
                 displaystring(debug,'\n%s',['computing bed slope (x and y derivatives)...']);
-                slopex=diagnostic_core_linear(m_sl,inputs,'slope_compute','bedx');
-                slopey=diagnostic_core_linear(m_sl,inputs,'slope_compute','bedy');
+                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,slopex,'slopex',0);
                 slopey=FieldExtrude(m_sl.elements,m_sl.nodes,m_sl.loads,m_sl.materials,slopey,'slopey',0);