Changeset 2219

Timestamp:

09/11/09 15:13:19 (16 years ago)

Author:

Eric.Larour

Message:

Simplified steady state control.

Location:

issm/trunk/src

Files:

• c/parallel/control_core.cpp (modified) (4 diffs)
• m/solutions/cielo/control_core.m (modified) (1 diff)

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

@@ -22 +22 @@
         DataSet* diagnostic_results=NULL;
         DataSet* gradjcompute_results=NULL;
+        DataSet* steadystate_results=NULL;
         Vec     u_g=NULL;
         double  search_scalar;
@@ -48 +49 @@
         int analysis_type;
         int sub_analysis_type;
+        int     control_steady;
         int debug=0;
         int convergence=0;
@@ -71 +73 @@
         model->FindParam(&sub_analysis_type,"sub_analysis_type");
         model->FindParam(&numberofnodes,"numberofnodes");
+        model->FindParam(&control_steady,"control_steady");
         gsize=fem_model->nodes->NumberOfDofs();
 
@@ -121 +124 @@
                 ControlConstrainx(param_g,numberofnodes,mincontrolconstraint,maxcontrolconstraint,control_type);
                 _printf_("%s\n","      done.");
+
+                /*In case we are running a steady state control method, compute new temperature field using new parameter 
+                 * distribution: */
+                steadystate_results=new DataSet(ResultsEnum());
+                steadystate_core(steadystate_results,model,inputs);
+                VecFree(&t_g); steadystate_results->FindResult(&t_g,"t_g");
+                delete results_steadystate;
+                inputs->Add("temperature",t_g,1,numberofnodes);
 
                 _printf_("%s%i%s%g\n","      value of misfit J after optimization #",n+1,": ",J[n]);

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

@@ -75 +75 @@
         param_g=ControlConstrain(param_g,model.parameters);
 
+        %In case we are running a steady state control method, compute new temperature field using new parameter distribution: 
+        if model.parameters.control_steady;
+                steadystate_results=steadystate_core(models,inputs); t_g=results.t_g; 
+                inputs=add(inputs,'temperature',t_g,'doublevec',1,,model.parameters.numberofnodes);
+        end
+
         disp(['      value of misfit J after optimization #' num2str(n) ':' num2str(c(n).J)]);