Changeset 276

Timestamp:

05/06/09 15:20:44 (16 years ago)

Author:

Eric.Larour

Message:

New inputlist and inputfield classes

Location:

issm/trunk/src/m/solutions/cielo

Files:

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

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

@@ -27 +27 @@
 
                 %initialize inputs, ie m.nparameters on which we invert.
-                inputs=parameterinputs;
+                inputs=inputlist;
                 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);

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

@@ -2 +2 @@
 
 %From parameters, build inputs for icediagnostic_core, using the final parameters
-inputs=parameterinputs;
+inputs=inputlist;
 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);

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

@@ -19 +19 @@
 
         %initialize inputs
-        inputs=parameterinputs;
+        inputs=inputlist;
         inputs=add(inputs,'velocity',m_dh.parameters.u_g,'doublevec',3,m_dh.parameters.numberofnodes);
 
@@ -35 +35 @@
                 disp(sprintf('\n%s',['computing vertical velocities...']));
         
-                inputs=parameterinputs;
                 inputs=add(inputs,'velocity',u_g,'doublevec',m_dh.parameters.numberofdofspernode,m_dh.parameters.numberofnodes);
 

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

@@ -10 +10 @@
 
 %Plug parameter into inputs
-inputs=parameterinputs;
+inputs=inputlist;
 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);