Changeset 3524

Timestamp:

04/13/10 14:18:09 (15 years ago)

Author:

seroussi

Message:

fixed control methods 3d serial

Location:

issm/trunk/src/m/solutions/jpl

Files:

• control_core.m (modified) (3 diffs)
• gradjcompute_core.m (modified) (1 diff)
• steadystate.m (modified) (1 diff)

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

@@ -36 +36 @@
         %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; 
+                steadystate_results=steadystate_core(models,inputs); t_g=steadystate_results.t_g; 
                 inputs=add(inputs,'temperature',t_g,'doublevec',1,model.parameters.numberofnodes);
         end
@@ -54 +54 @@
                         inputs=add(inputs,'velocity',u_g,'doublevec',4,model.parameters.numberofnodes);
                 else
-                        inputs=add(inputs,'velocity',u_g,'doublevec',3,model.parameters.numberofnodes);
+                        if model.parameters.control_steady;
+                                inputs=add(inputs,'velocity',u_g,'doublevec',3,model.parameters.numberofnodes);
+                        else
+                                inputs=add(inputs,'velocity',u_g,'doublevec',2,model.parameters.numberofnodes);
+                        end
                 end
         else
@@ -114 +118 @@
 if model.parameters.control_steady;
         inputs=add(inputs,model.parameters.control_type,param_g,'doublevec',1,model.parameters.numberofnodes);
-        steadystate_results=steadystate_core(models,inputs); t_g=results.t_g; 
+        steadystate_results=steadystate_core(models,inputs); t_g=steadystate_results.t_g; 
         u_g=steadystate_results.u_g;
         t_g=steadystate_results.t_g;

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

@@ -18 +18 @@
 [u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
 inputs=add(inputs,'velocity',u_g,'doublevec',m.parameters.numberofdofspernode,m.parameters.numberofnodes);
-
 
 %Buid Du, difference between observed velocity and model velocity.

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

@@ -45 +45 @@
         if md.control_analysis,
                 inputs=add(inputs,'velocity_obs',models.dh.parameters.u_g_obs,'doublevec',2,models.dh.parameters.numberofnodes);
+                inputs=add(inputs,'weights',models.dh.parameters.weights,'doublevec',1,models.dh.parameters.numberofnodes);
         end