more robust toolbox check

Author: scivision

+gemini3d/+plot/mag_map.m

@@ -6,8 +6,6 @@ function mag_map(direc)
 
 gemini3d.sys.check_stdlib()
 
-assert(gemini3d.sys.has_mapping(), "Mapping Toolbox is needed")
-
 direc = stdlib.expanduser(direc);
 
 %SIMULATION location
@@ -48,21 +46,21 @@ function mag_map(direc)
 Bphit=zeros(1,ltheta,lphi, length(cfg.times));
 
 for it=2:length(cfg.times)-1    %starts at second time step due to weird magcalc quirk
-  filename = gemini3d.datelab(cfg.times(it));
+  filename = gemini3d.datelab(cfg.times(it)) + ".h5";
 
-  data = h5read(fullfile(direc,'magfields', filename + ".h5"), '/magfields/Br');
+  data = h5read(fullfile(direc,'magfields', filename), '/magfields/Br');
 
   Brt(:,:,:,it)=reshape(data,[1,ltheta,lphi]);
   Brt(:,:,:,it)=Brt(:,ilatsort,:,it);
   Brt(:,:,:,it)=Brt(:,:,ilonsort,it);
 
-  data = h5read(fullfile(direc, 'magfields', filename + ".h5"), '/magfields/Btheta');
+  data = h5read(fullfile(direc, 'magfields', filename), '/magfields/Btheta');
 
   Bthetat(:,:,:,it)=reshape(data,[1,ltheta,lphi]);
   Bthetat(:,:,:,it)=Bthetat(:,ilatsort,:,it);
   Bthetat(:,:,:,it)=Bthetat(:,:,ilonsort,it);
 
-  data = h5read(fullfile(direc,'magfields', filename + ".h5"), '/magfields/Bphi');
+  data = h5read(fullfile(direc,'magfields', filename), '/magfields/Bphi');
 
   Bphit(:,:,:,it)=reshape(data,[1,ltheta,lphi]);
   Bphit(:,:,:,it)=Bphit(:,ilatsort,:,it);

+gemini3d/+plot/mapgrid.m

@@ -54,15 +54,15 @@
   figure;
   hold on;
   flag2D=false;
-  if gemini3d.sys.has_mapping()
-    ha=gca;
-%        axesm('MapProjection','Mercator','MapLatLimit',[-(abs(sourcemlat)+30),abs(sourcemlat)+30],'MapLonLimit',[sourcemlonplot-dmlon/2-10,sourcemlonplot+dmlon/2+10])
+  ha=gca;
+  try
+    % axesm('MapProjection','Mercator','MapLatLimit',[-(abs(sourcemlat)+30),abs(sourcemlat)+30],'MapLonLimit',[sourcemlonplot-dmlon/2-10,sourcemlonplot+dmlon/2+10])
     axesm('MapProjection','Mercator', ...
-      'MapLatLimit', double([-(abs(sourcemlat)+dmlat/2+5),abs(sourcemlat)+dmlat/2+5]), ...
-      'MapLonLimit', double([sourcemlonplot-dmlon/2-10,sourcemlonplot+dmlon/2+10]))
+      MapLatLimit=double([-(abs(sourcemlat)+dmlat/2+5),abs(sourcemlat)+dmlat/2+5]), ...
+      MapLonLimit=double([sourcemlonplot-dmlon/2-10,sourcemlonplot+dmlon/2+10]))
     plotfun=@plot3m;
-  else
-    ha=gca;
+  catch e
+    mappingException(e)
     plotfun=@plot3;   %no mapping toolbox so we'll do normal plots - the annoying thing is that these should be lon,lat,alt so all the plots statements have to be switched
   end
 end
@@ -101,7 +101,8 @@
   set(h,'LineWidth',LW,'Color',[0 0 0]);
   ha=h;
 else    %this is a 3D grid and we can plot it on a map if the user has the appropriate toolbox(es)
-  if gemini3d.sys.has_mapping()
+
+  try % Mapping Toolbox
     % plots are done lat,lon,alt for plot3m
     plotfun(mlat(:,1,1),mlon(:,1,1),alt(:,1,1),'LineWidth',LW);
     plotfun(mlat(:,1,end),mlon(:,1,end),alt(:,1,end),altlinestyle,'LineWidth',LW);
@@ -170,10 +171,10 @@
     z=squeeze(alt(end,end,ix3:xg.lx(3)));
     plotfun(x,y,z,altlinestyle,'LineWidth',LW);
 
-    xlabel('magnetic longitude (deg.)');
-    ylabel('magnetic latitude (deg.)');
-    zlabel('altitidue (km)');
-  else    %plotting is done lon,lat,alt with plot3
+  catch e
+    mappingException(e)
+
+    %plotting is done lon,lat,alt with plot3
     plotfun(mlon(:,1,1),mlat(:,1,1),alt(:,1,1),'LineWidth',LW);
     plotfun(mlon(:,1,end),mlat(:,1,end),alt(:,1,end),altlinestyle,'LineWidth',LW);
     plotfun(mlon(:,end,1),mlat(:,end,1),alt(:,end,1),'LineWidth',LW);
@@ -241,10 +242,12 @@
     z=squeeze(alt(end,end,ix3:xg.lx(3)));
     plotfun(x,y,z,altlinestyle,'LineWidth',LW);
 
-    xlabel('magnetic latitude (deg.)');
-    ylabel('magnetic longitude (deg.)');
-    zlabel('altitidue (km)');
   end
+
+  xlabel('magnetic longitude (deg.)');
+  ylabel('magnetic latitude (deg.)');
+  zlabel('altitude (km)');
+
   h=gca;     %now go back and make all lines the same color...
   % lline = numel(h.Children);
   for iline=1:16    %the last three children are the surface and text label objects
@@ -424,7 +427,7 @@
   h=polarplot(terr_theta,terr_r,'c:');
   set(h,'LineWidth',LW);
 else
-  if gemini3d.sys.has_mapping()
+  try % Mapping Toolbox
     hold on;
     %ax=axis;
     coastlat = load('coastlines', 'coastlat').coastlat;
@@ -441,6 +444,8 @@
     plotfun(mlatcoast,mloncoast,zeros(size(mlatcoast)),'b-','LineWidth',0.5);
     setm(gca,'MeridianLabel','on','ParallelLabel','on','MLineLocation',10,'PLineLocation',10,'MLabelLocation',10,'PLabelLocation',10);
     hold off;
+  catch e
+    mappingException(e)
   end
   view(270,35);
   axis tight;

+gemini3d/+plot/plotall.m

@@ -71,12 +71,10 @@
     % https://www.mathworks.com/help/parallel-computing/choose-between-thread-based-and-process-based-environments.html
     if opts.parallel > 1
       % specific number of workers requested
-      if gemini3d.sys.has_parallel()
-        pool = gcp('nocreate');
-        if isempty(pool) || pool.NumWorkers ~= optfions.parallel
-          delete(pool)
-          parpool('local', opts.parallel)
-        end
+      pool = gcp('nocreate');
+      if isempty(pool) || pool.NumWorkers ~= opts.parallel
+        delete(pool)
+        parpool('local', opts.parallel)
       end
     end
     parfor t = cfg.times

+gemini3d/+plot/private/mappingException.m

@@ -0,0 +1,9 @@
+function mappingException(e)
+
+if e.identifier ~= "MATLAB:UndefinedFunction"
+  rethrow(e)
+end
+
+disp('Fallback to non-Mapping Toolbox functions')
+
+end

+gemini3d/+sys/has_addon.m

@@ -3,7 +3,7 @@
 
 path_new = getenv("PATH");
 
-if ~gemini3d.sys.has_parallel()
+if ~stdlib.has_parallel_toolbox()
   return
 end
 

+gemini3d/+sys/has_mapping.m

@@ -3,5 +3,3 @@ option(hwm14 "use HWM14 model")
 option(msis2 "use MSIS2 model" on)
 
 set_directory_properties(PROPERTIES EP_UPDATE_DISCONNECTED true)
-
-option(CMAKE_TLS_VERIFY "Verify TLS certificates when downloading dependencies" on)