Changeset 2020

Timestamp:

08/27/09 14:10:33 (16 years ago)

Author:

seroussi

Message:

fixed control

Location:

issm/trunk/src/c

Files:

• ModelProcessorx/Control/CreateParametersControl.cpp (modified) (1 diff)
• parallel/diagnostic.cpp (modified) (1 diff)
• parallel/steadystate.cpp (modified) (2 diffs)

issm/trunk/src/c/ModelProcessorx/Control/CreateParametersControl.cpp

@@ -61 +61 @@
                 else if (strcmp(iomodel->control_type,"B")==0) param->SetDouble(1);
                 else throw ErrorException(__FUNCT__,exprintf("control_type %s not supported yet!",iomodel->control_type));
+                parameters->AddObject(param);
+
+                /*control_steady: */
+                count++;
+                param= new Param(count,"control_steady",DOUBLE);
+                param->SetDouble(0);
                 parameters->AddObject(param);
 

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

@@ -98 +98 @@
         inputs->Add("velocity",u_g_initial,3,numberofnodes);
         if(control_analysis){
+                model->FindParam(&u_g_obs,"u_g_obs",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
                 inputs->Add("velocity_obs",u_g_obs,2,numberofnodes);
         }

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

@@ -100 +100 @@
         model->FindParam(&numberofnodes,"numberofnodes");
         
-
         inputs=new ParameterInputs;
         inputs->Add("velocity",u_g_initial,3,numberofnodes);
         inputs->Add("pressure",p_g_initial,1,numberofnodes);
         inputs->Add("dt",dt);
+
         if(control_analysis){
+                model->FindParam(&u_g_obs,"u_g_obs",DiagnosticAnalysisEnum(),HorizAnalysisEnum());
                 inputs->Add("velocity_obs",u_g_obs,2,numberofnodes);
         }
@@ -174 +175 @@
         /*Free ressources */
         xfree((void**)&u_g_initial);
+        xfree((void**)&u_g_obs);
         xfree((void**)&p_g_initial);
         delete model;