Changeset 254

Timestamp:

05/05/09 16:56:43 (16 years ago)

Author:

Mathieu Morlighem

Message:

Some fixing (velocity needed in input before a diagnostic_core_nonlinear, initialization of inputs,...)

Location:

issm/trunk/src/m/solutions/cielo

Files:

• GradJCompute.m (modified) (3 diffs)
• control.m (modified) (1 diff)
• controlfinalsol.m (modified) (1 diff)
• objectivefunctionC.m (modified) (2 diffs)

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

@@ -3 +3 @@
 %Recover solution for this stiffness and right hand side: 
 if m.parameters.debug
-        disp('      computing velocities...')
+        disp('         computing velocities...')
 end
 [u_g K_ff0 K_fs0 ]=diagnostic_core_nonlinear(m,inputs);
@@ -9 +9 @@
 %Buid Du, difference between observed velocity and model velocity.
 if m.parameters.debug
-        disp('      computing Du...')
+        disp('         computing Du...')
 end
 [Du_g]=Du(m.elements,m.nodes,m.loads,m.materials,m.parameters, u_g,u_g_obs,inputs);
@@ -18 +18 @@
 %Solve for adjoint vector: 
 if m.parameters.debug
-        disp('      computing adjoint state...')
+        disp('         computing adjoint state...')
 end
 lambda_f=Solver(K_ff0,Du_f,[],m.parameters);

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

@@ -30 +30 @@
                 inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
                 inputs=add(inputs,'velocity',m.parameters.u_g,'doublevec',3,m.parameters.numberofnodes);
-                inputs=add(inputs,'fit',m.parameters.fit(n),'scalar');
+                inputs=add(inputs,'fit',m.parameters.fit(n),'double');
 
                 %Update inputs in datasets

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

@@ -2 +2 @@
 
 %From parameters, build inputs for icediagnostic_core, using the final parameters
+inputs=parameterinputs;
+inputs=add(inputs,'velocity',m.parameters.u_g,'doublevec',3,m.parameters.numberofnodes);
 inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m.parameters.numberofnodes);
 u_g=diagnostic_core_nonlinear(m,inputs);

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

@@ -10 +10 @@
 
 %Plug parameter into inputs
+inputs=parameterinputs;
+inputs=add(inputs,'velocity',m.parameters.u_g,'doublevec',3,m.parameters.numberofnodes);
 inputs=add(inputs,m.parameters.control_type,parameter,'doublevec',2,m.parameters.numberofnodes);
 
@@ -16 +18 @@
 
 %Compute misfit for this velocity field. 
-inputs=add(inputs,'fit',m.parameters.fit(n),,'scalar');
+inputs=add(inputs,'fit',m.parameters.fit(n),'double');
 J=Misfit(m.elements,m.nodes,m.loads,m.materials,m.parameters, u_g, u_g_obs,inputs);