Changeset 1753

Timestamp:

08/18/09 14:52:09 (16 years ago)

Author:

seroussi

Message:

changec names in macayleal's model

Location:

issm/trunk/src/m/solutions/macayeal

Files:

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

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

@@ -38 +38 @@
 rho_water=md.rho_water;
 g=md.g;
-index_icefront=md.segmentonneumann_diag; index_icefront=index_icefront(:,1:2); %we strip the last column, which holds the element number for the boundary segment
+index_icefront=md.pressureload; index_icefront=index_icefront(:,1:2); %we strip the last column, which holds the element number for the boundary segment
 nodes_on_boundary=md.gridonboundary;
 nodes_on_dirichlet=md.gridondirichlet_diag;

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

@@ -36 +36 @@
 g=md.g;
 viscosity_overshoot=md.viscosity_overshoot;
-index_icefront=md.segmentonneumann_diag; index_icefront=index_icefront(:,1:2); %we strip the last column, which holds the element number for the boundary segment
+index_icefront=md.pressureload; index_icefront=index_icefront(:,1:2); %we strip the last column, which holds the element number for the boundary segment
 nodes_on_boundary=md.gridonboundary;
 nodes_on_icefront=zeros(nods,1); nodes_on_icefront(index_icefront)=1;
-node_on_dirichlet=md.gridondirichlet_diag;
+node_on_dirichlet=md.spcvelocity(:,1);
 nodes_on_icesheet=md.gridonicesheet;
 element_on_icesheet=md.elementonicesheet;
@@ -249 +249 @@
 specified_velocity=zeros(2*nods,1);
 pos=find(node_on_dirichlet);
-specified_velocity(pos)=md.dirichletvalues_diag(pos,1)/md.yts;
-specified_velocity(nods+pos)=md.dirichletvalues_diag(pos,2)/md.yts;
+specified_velocity(pos)=md.spcvelocity(pos,1)/md.yts;
+specified_velocity(nods+pos)=md.spcvelocity(pos,2)/md.yts;