Changeset 327

Timestamp:

05/11/09 09:23:32 (16 years ago)

Author:

seroussi

Message:

removed basevert to be like cielo

Location:

issm/trunk/src/m/solutions/ice

Files:

• ModelProcessor.m (modified) (1 diff)
• ModelProcessorDiagnosticBaseVert.m (deleted)
• ModelProcessorDiagnosticVert.m (modified) (1 diff)
• diagnostic.m (modified) (1 diff)
• diagnostic3d.m (modified) (1 diff)
• diagnostic_core_linear.m (modified) (1 diff)

issm/trunk/src/m/solutions/ice/ModelProcessor.m

@@ -18 +18 @@
 elseif strcmpi(solutiontype,'diagnostic_hutter'),
         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticHutter(md);
-elseif strcmpi(solutiontype,'diagnostic_basevert'),
-        [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorDiagnosticBaseVert(md);
 elseif strcmpi(solutiontype,'thermalsteady')| strcmpi(solutiontype,'thermaltransient'),
         [elements,grids,loads,constraints,materials,part,tpart]=ModelProcessorThermal(md,solutiontype);

issm/trunk/src/m/solutions/ice/ModelProcessorDiagnosticVert.m

@@ -108 +108 @@
 loads=struct('load',cell([0,1]));
 
-%Single point constraints:
-spcs=find(md.gridonbed);
-constraints=struct('constraint',cell(length(spcs),1));
-
-count=1;
-for i=1:md.numberofgrids,
-        if md.gridonbed(i),
-
-                %constrain first dof
-                constraints(count).constraint=spc;
-                constraints(count).constraint.grid=i;
-                constraints(count).constraint.dof=3;
-                constraints(count).constraint.value=0; %this will be change to vz in the solution sequences.
-                count=count+1;
-        end
-end
+%No single constraints
+constraints=struct('constraint',cell(0,0));
 
 %Last thing, return a partitioning vector, and its transpose.

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

@@ -54 +54 @@
 
         %First, build elements,grids,loads, etc ... for horizontal, base vertical and vertical model
-        fem.m_dbv=CreateFemModel(md,'diagnostic_basevert');
         fem.m_dv=CreateFemModel(md,'diagnostic_vert');
 

issm/trunk/src/m/solutions/ice/diagnostic3d.m

@@ -60 +60 @@
 inputs.velocity_average=velocity_average;
 
-%Compute basal vertical velocity, in 3d
-disp(sprintf('\n%s',['computing basal vertical velocity...']));
-u_g_basevert=diagnostic_core_linear(fem.m_dbv,'diagnostic_basevert',inputs);
-
 %update dirichlet boundary conditions with these new base vertical velocities
 m_dv=fem.m_dv;
 gridset=m_dv.gridset;
-m_dv.y_g=u_g_basevert; m_dv.ys=Reducevector_g(m_dv.y_g);
 
 %compute vertical velocities

issm/trunk/src/m/solutions/ice/diagnostic_core_linear.m

@@ -44 +44 @@
 [K_gg,p_g]=PenaltySystemMatrices(grids,loads,materials,kflag, pflag, sparsity,inputs,analysis_type,K_gg,p_g);
 
+if strcmpi(analysis_type,'diagnostic_hutter'),
+        K_gg 
+        p_g 
+        %error
+end
 if cluster, 
         K_gg=distributed(gplus(K_gg),'convert');