Changeset 248

Timestamp:

05/05/09 16:07:12 (16 years ago)

Author:

Eric.Larour

Message:

Missing inputs changes

Location:

issm/trunk/src/m/solutions/cielo

Files:

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

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

@@ -27 +27 @@
 
                 %initialize inputs, ie m.nparameters on which we invert.
-                eval(['inputs.' m.parameters.control_type '=p_g;']);
-                inputs.fit=m.parameters.fit(n);
+                inputs=add(inputs,m.parameters.control_type,p_g,'doublevec',2,m_dh.parameters.numberofnodes);
+                inputs=add(inputs,'fit',m.parameters.fit(n),,'scalar');
 
                 %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
-eval(['inputs.' m.parameters.control_type '=p_g;']);
+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/diagnostic.m

@@ -34 +34 @@
 
                 disp(sprintf('\n%s',['computing vertical velocities...']));
-                u_g_vert=diagnostic_core_linear(m_dv,struct('velocity',u_g));
+        
+                inputs=parameterinputs;
+                inputs=add(inputs,'velocity',u_g,'doublevec',m_dh.parameters.numberofdofspernode,m_dh.parameters.numberofnodes);
+
+                u_g_vert=diagnostic_core_linear(m_dv,inputs);
 
                 %load results onto model: 

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

@@ -10 +10 @@
 
 %Plug parameter into inputs
-eval(['inputs.' control_type '=parameter;']);
+inputs=add(inputs,m.parameters.control_type,parameter,'doublevec',2,m.parameters.numberofnodes);
 
 %Run diagnostic with updated parameters.
@@ -16 +16 @@
 
 %Compute misfit for this velocity field. 
-inputs.fit=fit;
+inputs=add(inputs,'fit',m.parameters.fit(n),,'scalar');
 J=Misfit(m.elements,m.nodes,m.loads,m.materials,m.parameters, u_g, u_g_obs,inputs);