Changeset 25364

Timestamp:

08/10/20 08:42:02 (5 years ago)

Author:

Mathieu Morlighem

Message:

CHG: improved error message handling

Location:

issm/trunk-jpl/src/m

Files:

• modules/CoordTransform.m (modified) (1 diff)
• parameterization/parameterize.m (modified) (1 diff)

issm/trunk-jpl/src/m/modules/CoordTransform.m

@@ -8 +8 @@
 %   xout, yout: output coordinates (in new projection)
 %   projin,projout: input/output projection string (PROJ)
+%
+%   Example of Projections:
+%      
+%   lat/lon = '+init=epsg:4326'
+%   lat/lon = '+proj=longlat +datum=WGS84'
+%   
+%   ll2xy default equivalent (uses with Hugues Ellispoid S)
+%   Greenland = '+proj=stere +lat_0=90 +lat_ts=70 +lon_0=-45 +k=1 +x_0=0 +y_0=0 +a=6378273 +b=6356889.448564109 +units=m +no_defs'
+%   Antarctica = '+proj=stere +lat_0=-90 +lat_ts=-71 +lon_0=0 +k=1 +x_0=0 +y_0=0 +a=6378273 +b=6356889.448564109 +units=m +no_defs'
+%   Bamber Greenland = '+proj=stere +lat_0=90 +lat_ts=71 +lon_0=-39 +k=1 +x_0=0 +y_0=0 +ellps=WGS84 +datum=WGS84 +units=m +no_defs'
+%
+%   for latitude/longitude, x is longitude and y latitude and the angles are in rad
 %
 %   This function will only work of PROJ has been installed in externalpackages

issm/trunk-jpl/src/m/parameterization/parameterize.m

@@ -36 +36 @@
 
         %rename parameter file
-        me2.message=regexprep(me2.message,[temporaryname '.m'],parametername);
         for i=1:length(me2.stack)-1,
-                me2.stack(i).file=regexprep(me2.stack(i).file,[temporaryname '.m'],parametername);
-                me2.stack(i).name=regexprep(me2.stack(i).name,[temporaryname],parametername);
+                if strcmp(me2.stack(i).name,temporaryname)
+                        me2.stack(i).file = strrep(me2.stack(i).file,temporaryname,parametername);
+                        me2.stack(i).name = parametername;
+                end
                 if strcmp(me2.stack(i).name,'parameterize'),
                         %remove error (eval(temporaryname);) misleading