Changeset 25836 for issm/trunk/src/m/mesh/TwoDToThreeD.m

Timestamp:

12/08/20 08:45:53 (4 years ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 25834

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/mesh/TwoDToThreeD.m (modified) (3 diffs)

issm/trunk/src/m/mesh/TwoDToThreeD.m

@@ -1 @@
-function md=TwoDToThreeD(md)
-
+function md=TwoDToThreeD(md,planet)
         %reproject model into lat,long if necessary:
-        if md.mesh.epsg~=4326,
-                [md.mesh.x,md.mesh.y]=gdaltransform(md.mesh.x,md.mesh.y,sprintf('EPSG:%i',md.mesh.epsg),sprintf('EPSG:4326'));
+        if ~strcmpi(md.mesh.proj,epsg2proj(4326)),
+                [md.mesh.x,md.mesh.y]=gdaltransform(md.mesh.x,md.mesh.y,md.mesh.proj,'EPSG:4326');
         end
 
         %Make a 3dsurface mesh out of this: 
-        R=6.371012*10^6; 
+        R=planetradius(planet);
 
         %we assume x and y hold the long,lat values:
         long=md.mesh.x;
         lat=md.mesh.y;
-        mask=md.mask;
 
+        %Assume spherical body: 
         x = R .* cosd(lat) .* cosd(long);
         y = R .* cosd(lat) .* sind(long);
@@ -21 +20 @@
         vc=md.mesh.vertexconnectivity;
         vb=md.mesh.vertexonboundary;
-        md.mesh=mesh3dsurface(); md.mask=maskpsl();
+        md.mesh=mesh3dsurface();
         md.mesh.lat=lat;
         md.mesh.long=long;
@@ -33 +32 @@
         md.mesh.vertexconnectivity=vc;
         md.mesh.vertexonboundary=vb;
-        if strcmpi(class(mask),'maskpsl'),
-                md.mask=mask;
-        else
-                md.mask.ice_levelset=mask.ice_levelset;
-                md.mask.groundedice_levelset=mask.groundedice_levelset;
-        end