Changeset 1972

Timestamp:

08/26/09 17:03:10 (16 years ago)

Author:

Mathieu Morlighem

Message:

minor

Location:

issm/trunk/src

Files:

• c/parallel/objectivefunctionC.cpp (modified) (2 diffs)
• m/solutions/cielo/control.m (deleted)
• m/solutions/cielo/objectivefunctionC.m (modified) (2 diffs)

issm/trunk/src/c/parallel/objectivefunctionC.cpp

@@ -72 +72 @@
         femmodel->parameters->FindParam((void*)&numberofnodes,"numberofnodes");
         femmodel->parameters->FindParam((void*)&numberofdofspernode,"numberofdofspernode");
-        femmodel->parameters->FindParam((void*)&dt,"dt");
         femmodel->parameters->FindParam((void*)&isstokes,"isstokes");
 
@@ -88 +87 @@
         inputs->Add(control_type,param_g_copy,1,numberofnodes);
 
-        if(dt==0){
+        if (analysis_type==DiagnosticAnalysisEnum()){
                 //Run diagnostic with updated parameters.
                 diagnostic_core_nonlinear(&u_g,NULL,NULL,NULL,femmodel,inputs,DiagnosticAnalysisEnum(),sub_analysis_type);

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

@@ -8 +8 @@
 fit=m.parameters.fit(n);
 control_type=m.parameters.control_type;
-dt=m.parameters.dt;
+analysis_type=m.parameters.analysis_type;
 
 %Update along gradient using scalar supplied by fmincon optimization routine
@@ -17 +17 @@
 
 %Run diagnostic with updated parameters.
-if dt==0, 
+if (analysis_type==DiagnosticAnalysisEnum()), 
         %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);