Changeset 1860

Timestamp:

08/25/09 09:58:04 (16 years ago)

Author:

seroussi

Message:

changed name from thermalstatic to steadystate in cielo

Location:

issm/trunk/src/m/solutions/cielo

Files:

• objectivefunctionC.m (modified) (2 diffs)
• steadystate.m (added)
• steadystate_core.m (added)
• thermalstatic.m (deleted)
• thermalstatic_core.m (deleted)

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

@@ -8 +8 @@
 fit=m.parameters.fit(n);
 control_type=m.parameters.control_type;
-thermalstatic=m.parameters.thermalstatic;
+steadystate=m.parameters.steadystate;
 
 %Update along gradient using scalar supplied by fmincon optimization routine
@@ -17 +17 @@
 
 %Run diagnostic with updated parameters.
-if ~thermalstatic, 
+if ~steadystate, 
         %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);
 else
         %do a full thermal mechanical steady state converged computation, much slower!
-        results=thermalstatic_core(models,inputs); u_g=results.u_g; 
+        results=steadystate_core(models,inputs); u_g=results.u_g; 
 
         %u_g ships with 3 or 4 dofs, we only want the horizontal ones!