Changeset 2027

Timestamp:

08/27/09 16:22:03 (16 years ago)

Author:

seroussi

Message:

fixed control steady state serial

Location:

issm/trunk/src/m/solutions/cielo

Files:

• diagnostic_core.m (modified) (1 diff)
• gradjcompute_core.m (modified) (1 diff)
• objectivefunctionC.m (modified) (1 diff)
• steadystate.m (modified) (1 diff)

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

@@ -15 +15 @@
 %recover parameters common to all solutions
 debug=m_dhu.parameters.debug;
-dim=m_dhu.parameters.dim;
+dim=m_dh.parameters.dim;
 ishutter=m_dhu.parameters.ishutter;
 ismacayealpattyn=m_dh.parameters.ismacayealpattyn;

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

@@ -42 +42 @@
 end
 
-if analysis_type==SteadystateAnalysisEnum(),
+if m.parameters.control_steady,
         %compute initial velocity from diagnostic_core (horiz+vertical)
-        displaystring(debug,'%s','          compute initial velocity...');
+        displaystring(debug,'%s','          compute 3d initial velocity...');
         results_diag=diagnostic_core(models,inputs);
         u_g=results_diag.u_g;

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

@@ -17 +17 @@
 
 %Run diagnostic with updated parameters.
-if (analysis_type==DiagnosticAnalysisEnum()), 
+if ~m.parameters.control_steady;
         %do a simple diagnostic, with the current temperature profile, do not look for steady state.
         u_g=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);

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

@@ -50 +50 @@
         if ~models.dh.parameters.qmu_analysis,
                 if md.control_analysis,
+                        %change control_steady to 1
+                        models.dh.parameters.control_steady=1;
+                        models.ds.parameters.control_steady=1;
                         %launch core of control solution.
                         results=control_core(models,inputs);