Index: /issm/trunk/src/m/kml/kml_mesh_elem.m =================================================================== --- /issm/trunk/src/m/kml/kml_mesh_elem.m (revision 7126) +++ /issm/trunk/src/m/kml/kml_mesh_elem.m (revision 7127) @@ -139,15 +139,8 @@ kring.coords =zeros(size(md.elements,2)+1,3); - if ~isempty(md.lat) & ~isempty(md.long), - for j=1:size(md.elements,2) - lat=md.lat(md.elements(i,j)); long=md.long(md.elements(i,j)); - kring.coords(j,:)=[long lat alt]; - end - else - for j=1:size(md.elements,2) - [lat,long]=mapxy(md.x(md.elements(i,j)),md.y(md.elements(i,j)),'s'); - kring.coords(j,:)=[long lat alt]; - end - end + for j=1:size(md.elements,2) + [lat,long]=xy2ll(md.x(md.elements(i,j)),md.y(md.elements(i,j)),-1); + kring.coords(j,:)=[long lat alt]; + end kring.coords(end,:)=kring.coords(1,:); Index: /issm/trunk/src/m/kml/kml_part_edges.m =================================================================== --- /issm/trunk/src/m/kml/kml_part_edges.m (revision 7126) +++ /issm/trunk/src/m/kml/kml_part_edges.m (revision 7127) @@ -218,8 +218,8 @@ % if first edge, write out first node if ~elast - [lat,long]=mapxy(md.x(edgeper(j,1)),md.y(edgeper(j,1)),'s'); + [lat,long]=xy2ll(md.x(edgeper(j,1)),md.y(edgeper(j,1)),-1); kline.coords(end+1,:)=[long lat alt]; end - [lat,long]=mapxy(md.x(edgeper(j,2)),md.y(edgeper(j,2)),'s'); + [lat,long]=xy2ll(md.x(edgeper(j,2)),md.y(edgeper(j,2)),-1); kline.coords(end+1,:)=[long lat alt]; elast=elemper(j); @@ -309,6 +309,6 @@ % write out first node of first side for half-edge to midpoint % disp(['segment j=' int2str(j) ' unshared half edge from node ' int2str(elemp(ielem,nlast)) ' (node ' int2str(nlast) ') on side ' int2str(slast) ' from element ' int2str(ielem) ' written.']) - [lat,long]=mapxy((md.x(elemp(ielem,nlast))),... - (md.y(elemp(ielem,nlast))),'s'); + [lat,long]=xy2ll((md.x(elemp(ielem,nlast))),... + (md.y(elemp(ielem,nlast))),-1); kline.coords(end+1,:)=[long lat alt]; end @@ -316,8 +316,8 @@ % write out midpoint of first side - [lat,long]=mapxy((md.x(elemp(ielem,slast))... + [lat,long]=xy2ll((md.x(elemp(ielem,slast))... +md.x(elemp(ielem,mod(slast,3)+1)))/2.,... (md.y(elemp(ielem,slast))... - +md.y(elemp(ielem,mod(slast,3)+1)))/2.,'s'); + +md.y(elemp(ielem,mod(slast,3)+1)))/2.,-1); kline.coords(end+1,:)=[long lat alt]; end @@ -359,8 +359,8 @@ % write out half-edge from current node to midpoint of unshared side % disp(['segment j=' int2str(j) ' unshared half edge from node ' int2str(elemp(ielem,nlast)) ' (node ' int2str(nlast) ') on side ' int2str(slast) ' from element ' int2str(ielem) ' written.']) - [lat,long]=mapxy((md.x(elemp(ielem,nlast))... + [lat,long]=xy2ll((md.x(elemp(ielem,nlast))... +md.x(elemp(ielem,nnext)))/2.,... (md.y(elemp(ielem,nlast))... - +md.y(elemp(ielem,nnext)))/2.,'s'); + +md.y(elemp(ielem,nnext)))/2.,-1); kline.coords(end+1,:)=[long lat alt]; nlast=0; @@ -393,6 +393,6 @@ % all different, so cut through centroid % disp(['element ielem=' int2str(ielem) ' centroid written.']) - [lat,long]=mapxy(sum(md.x(elemp(ielem,:)))/3.,... - sum(md.y(elemp(ielem,:)))/3.,'s'); + [lat,long]=xy2ll(sum(md.x(elemp(ielem,:)))/3.,... + sum(md.y(elemp(ielem,:)))/3.,-1); kline.coords(end+1,:)=[long lat alt]; end @@ -409,8 +409,8 @@ % write out midpoint of opposite side % disp(['segment j=' int2str(j) ' internal edge from side ' int2str(slast) ' to side ' int2str(snext) ' from element ' int2str(ielem) ' written.']) - [lat,long]=mapxy((md.x(elemp(ielem,snext))... + [lat,long]=xy2ll((md.x(elemp(ielem,snext))... +md.x(elemp(ielem,mod(snext,3)+1)))/2.,... (md.y(elemp(ielem,snext))... - +md.y(elemp(ielem,mod(snext,3)+1)))/2.,'s'); + +md.y(elemp(ielem,mod(snext,3)+1)))/2.,-1); kline.coords(end+1,:)=[long lat alt]; elast=ielem; @@ -442,6 +442,6 @@ end % disp(['segment j=' int2str(j) ' unshared half edge on side ' int2str(slast) ' to node ' int2str(elemp(elast,nnext)) ' (node ' int2str(nnext) ') from element ' int2str(elast) ' written.']) - [lat,long]=mapxy(md.x(elemp(elast,nnext)),... - md.y(elemp(elast,nnext)),'s'); + [lat,long]=xy2ll(md.x(elemp(elast,nnext)),... + md.y(elemp(elast,nnext)),-1); kline.coords(end+1,:)=[long lat alt]; break Index: /issm/trunk/src/m/kml/kml_part_elems.m =================================================================== --- /issm/trunk/src/m/kml/kml_part_elems.m (revision 7126) +++ /issm/trunk/src/m/kml/kml_part_elems.m (revision 7127) @@ -183,5 +183,5 @@ for j=1:size(elem,2) - [lat,long]=mapxy(md.x(elem(i,j)),md.y(elem(i,j)),'s'); + [lat,long]=xy2ll(md.x(elem(i,j)),md.y(elem(i,j)),-1); kring.coords(j,:)=[long lat alt]; end Index: /issm/trunk/src/m/kml/kml_part_flagedges.m =================================================================== --- /issm/trunk/src/m/kml/kml_part_flagedges.m (revision 7126) +++ /issm/trunk/src/m/kml/kml_part_flagedges.m (revision 7127) @@ -83,5 +83,5 @@ for j=1:2 - [lat,long]=mapxy(xseg(i,j),yseg(i,j),'s'); + [lat,long]=xy2ll(xseg(i,j),yseg(i,j),-1); kline.coords(j,:)=[long lat alt]; end Index: /issm/trunk/src/m/kml/kml_partitions.m =================================================================== --- /issm/trunk/src/m/kml/kml_partitions.m (revision 7126) +++ /issm/trunk/src/m/kml/kml_partitions.m (revision 7127) @@ -220,8 +220,8 @@ % if first edge, write out first node if ~elast - [lat,long]=mapxy(md.x(edgeper(j,1)),md.y(edgeper(j,1)),'s'); + [lat,long]=xy2ll(md.x(edgeper(j,1)),md.y(edgeper(j,1)),-1); kring.coords(end+1,:)=[long lat alt]; end - [lat,long]=mapxy(md.x(edgeper(j,2)),md.y(edgeper(j,2)),'s'); + [lat,long]=xy2ll(md.x(edgeper(j,2)),md.y(edgeper(j,2)),-1); kring.coords(end+1,:)=[long lat alt]; elast=elemper(j); @@ -311,6 +311,6 @@ % write out first node of first side for half-edge to midpoint % disp(['segment j=' int2str(j) ' unshared half edge from node ' int2str(elemp(ielem,nlast)) ' (node ' int2str(nlast) ') on side ' int2str(slast) ' from element ' int2str(ielem) ' written.']) - [lat,long]=mapxy((md.x(elemp(ielem,nlast))),... - (md.y(elemp(ielem,nlast))),'s'); + [lat,long]=xy2ll((md.x(elemp(ielem,nlast))),... + (md.y(elemp(ielem,nlast))),-1); kring.coords(end+1,:)=[long lat alt]; end @@ -318,8 +318,8 @@ % write out midpoint of first side - [lat,long]=mapxy((md.x(elemp(ielem,slast))... + [lat,long]=xy2ll((md.x(elemp(ielem,slast))... +md.x(elemp(ielem,mod(slast,3)+1)))/2.,... (md.y(elemp(ielem,slast))... - +md.y(elemp(ielem,mod(slast,3)+1)))/2.,'s'); + +md.y(elemp(ielem,mod(slast,3)+1)))/2.,-1); kring.coords(end+1,:)=[long lat alt]; end @@ -361,8 +361,8 @@ % write out half-edge from current node to midpoint of unshared side % disp(['segment j=' int2str(j) ' unshared half edge from node ' int2str(elemp(ielem,nlast)) ' (node ' int2str(nlast) ') on side ' int2str(slast) ' from element ' int2str(ielem) ' written.']) - [lat,long]=mapxy((md.x(elemp(ielem,nlast))... + [lat,long]=xy2ll((md.x(elemp(ielem,nlast))... +md.x(elemp(ielem,nnext)))/2.,... (md.y(elemp(ielem,nlast))... - +md.y(elemp(ielem,nnext)))/2.,'s'); + +md.y(elemp(ielem,nnext)))/2.,-1); kring.coords(end+1,:)=[long lat alt]; nlast=0; @@ -395,6 +395,6 @@ % all different, so cut through centroid % disp(['element ielem=' int2str(ielem) ' centroid written.']) - [lat,long]=mapxy(sum(md.x(elemp(ielem,:)))/3.,... - sum(md.y(elemp(ielem,:)))/3.,'s'); + [lat,long]=xy2ll(sum(md.x(elemp(ielem,:)))/3.,... + sum(md.y(elemp(ielem,:)))/3.,-1); kring.coords(end+1,:)=[long lat alt]; end @@ -411,8 +411,8 @@ % write out midpoint of opposite side % disp(['segment j=' int2str(j) ' internal edge from side ' int2str(slast) ' to side ' int2str(snext) ' from element ' int2str(ielem) ' written.']) - [lat,long]=mapxy((md.x(elemp(ielem,snext))... + [lat,long]=xy2ll((md.x(elemp(ielem,snext))... +md.x(elemp(ielem,mod(snext,3)+1)))/2.,... (md.y(elemp(ielem,snext))... - +md.y(elemp(ielem,mod(snext,3)+1)))/2.,'s'); + +md.y(elemp(ielem,mod(snext,3)+1)))/2.,-1); kring.coords(end+1,:)=[long lat alt]; elast=ielem; @@ -444,6 +444,6 @@ end % disp(['segment j=' int2str(j) ' unshared half edge on side ' int2str(slast) ' to node ' int2str(elemp(elast,nnext)) ' (node ' int2str(nnext) ') from element ' int2str(elast) ' written.']) - [lat,long]=mapxy(md.x(elemp(elast,nnext)),... - md.y(elemp(elast,nnext)),'s'); + [lat,long]=xy2ll(md.x(elemp(elast,nnext)),... + md.y(elemp(elast,nnext)),-1); kring.coords(end+1,:)=[long lat alt]; break Index: /issm/trunk/src/m/kml/kml_unsh_edges.m =================================================================== --- /issm/trunk/src/m/kml/kml_unsh_edges.m (revision 7126) +++ /issm/trunk/src/m/kml/kml_unsh_edges.m (revision 7127) @@ -89,5 +89,5 @@ for j=1:2 - [lat,long]=mapxy(md.x(edgeuns(i,j)),md.y(edgeuns(i,j)),'s'); + [lat,long]=xy2ll(md.x(edgeuns(i,j)),md.y(edgeuns(i,j)),-1); kline.coords(j,:)=[long lat alt]; end