Changeset 1207

Timestamp:

07/01/09 17:09:41 (16 years ago)

Author:

Mathieu Morlighem

Message:

Added routine needed fr Stokes

Location:

issm/trunk/src/m/solutions/cielo

Files:

• ControlPrepareStokes.m (added)
• control_core.m (modified) (4 diffs)
• objectivefunctionC.m (modified) (1 diff)

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

@@ -8 +8 @@
 %recover models
 m_dh=models.dh;
+m_dv=models.dv;
+m_ds=models.ds;
+m_sl=models.sl;
 
 %recover parameters common to all solutions
@@ -22 +25 @@
 options=ControlOptions(m_dh.parameters);
 
+%Take car of Stokes : compute slope and get spc once for all
+if isstokes,
+        [inputs m_ds]=ControlProcessStokes(models,inputs);
+end
+
 for n=1:m_dh.parameters.nsteps,
 
@@ -34 +42 @@
 
         %Update inputs in datasets
-        [m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials]=UpdateFromInputs(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,inputs);
+        if isstokes,
+                [m_ds.elements,m_ds.nodes,m_ds.loads,m_ds.materials]=UpdateFromInputs(m_ds.elements,m_ds.nodes,m_ds.loads,m_ds.materials,inputs);
+        else
+                [m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials]=UpdateFromInputs(m_dh.elements,m_dh.nodes,m_dh.loads,m_dh.materials,inputs);
+        end
 
         displaystring(debug,'\n%s',['      computing gradJ...']);
-        [u_g c(n).grad_g]=GradJCompute(m_dh,inputs,'diagnostic','horiz');
-        inputs=add(inputs,'velocity',u_g,'doublevec',2,m_dh.parameters.numberofnodes);
+        if isstokes,
+                [u_g c(n).grad_g]=GradJCompute(m_ds,inputs,'diagnostic','stokes');
+                inputs=add(inputs,'velocity',u_g,'doublevec',4,m_ds.parameters.numberofnodes);
+        else
+                [u_g c(n).grad_g]=GradJCompute(m_dh,inputs,'diagnostic','horiz');
+                inputs=add(inputs,'velocity',u_g,'doublevec',2,m_dh.parameters.numberofnodes);
+        end
 
         displaystring(debug,'\n%s',['      normalizing directions...']);
@@ -53 +70 @@
 
         displaystring(debug,'\n%s',['      optimizing along gradient direction...']);
-        [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,m_dh,inputs,param_g,c(n).grad_g,n,'diagnostic','horiz');
+        if isstokes,
+                [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,m_ds,inputs,param_g,c(n).grad_g,n,'diagnostic','stokes');
+        else
+                [search_scalar c(n).J]=ControlOptimization('objectivefunctionC',0,1,options,m_dh,inputs,param_g,c(n).grad_g,n,'diagnostic','horiz');
+        end
 
         displaystring(debug,'\n%s',['      updating parameter using optimized search scalar...']);

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

@@ -14 +14 @@
 %Run diagnostic with updated parameters.
 u_g=diagnostic_core_nonlinear(m,inputs,analysis_type,sub_analysis_type);
-inputs=add(inputs,'velocity',u_g,'doublevec',2,m.parameters.numberofnodes);
+inputs=add(inputs,'velocity',u_g,'doublevec',m.parameters.numberofdofspernode,m.parameters.numberofnodes);
 
 %Compute misfit for this velocity field.