Changeset 3962

Timestamp:

05/26/10 16:33:43 (15 years ago)

Author:

Mathieu Morlighem

Message:

now use ReduceLoad and Merge without ys0 (flag true or false instead)

Location:

issm/trunk/src/m/solutions/jpl

Files:

• ControlInitialization.m (modified) (1 diff)
• CreateFemModel.m (modified) (1 diff)
• diagnostic_core.m (modified) (2 diffs)
• gradjcompute_core.m (modified) (2 diffs)

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

@@ -66 +66 @@
 m_ds.y_g=zeros(m_ds.nodesets.gsize,1);
 m_ds.y_g(dofsetgen([1,2,3],4,m_ds.nodesets.gsize))=u_g;
-[m_ds.ys m_ds.ys0]=Reducevectorgtos(m_ds.y_g,m_ds.nodesets);
+m_ds.ys=Reducevectorgtos(m_ds.y_g,m_ds.nodesets);
 
 %Compute Stokes velocities once to have a reasonably good ug in input

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

@@ -24 +24 @@
 
         displaystring(md.verbose,'%s','   reducing single point constraints vector...');
-        [m.ys m.ys0]=Reducevectorgtos(m.yg.vector,m.nodesets);
+        m.ys=Reducevectorgtos(m.yg.vector,m.nodesets);
         
         displaystring(md.verbose,'%s','   normalizing rigid body constraints matrix...');

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

@@ -44 +44 @@
         if ismacayealpattyn,
                 model.dh.y_g=u_g;
-                [model.dh.ys model.dh.ys0]=Reducevectorgtos(model.dh.y_g,model.dh.nodesets);
+                model.dh.ys=Reducevectorgtos(model.dh.y_g,model.dh.nodesets);
         end
 
@@ -90 +90 @@
                 model.ds.y_g(dofsetgen([1,2],4,model.ds.nodesets.gsize))=u_g;
                 model.ds.y_g(dofsetgen([3],4,model.ds.nodesets.gsize))=u_g_vert;
-                [model.ds.ys model.ds.ys0]=Reducevectorgtos(model.ds.y_g,model.ds.nodesets);
+                model.ds.ys=Reducevectorgtos(model.ds.y_g,model.ds.nodesets);
 
                 displaystring(verbose,'\n%s',['computing stokes velocities and pressure ...']);

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

@@ -24 +24 @@
 
 %Reduce adjoint load from g-set to f-set
-[Du_f] = Reduceloadfromgtof( Du_g, m.Gmn, K_fs0, m.ys0, m.nodesets);
+[Du_f] = Reduceloadfromgtof( Du_g, m.Gmn, K_fs0, m.ys, m.nodesets,1);% 1 because we want ys0
 
 %Solve for adjoint vector: 
@@ -31 +31 @@
 
 %Merge back to g set
-lambda_g= Mergesolutionfromftog( lambda_f, m.Gmn, m.ys0, m.nodesets ); 
+lambda_g= Mergesolutionfromftog( lambda_f, m.Gmn, m.ys, m.nodesets,1); % 1 because we want ys0
 inputs=add(inputs,'adjoint',lambda_g,'doublevec',m.parameters.NumberOfDofsPerNode,m.parameters.NumberOfNodes);