Merge branch 'dev' of github.com:hguo/ftk into dev

Author: guo.2154

include/ftk/filters/critical_line_tracker_3d_regular.hh

@@ -334,11 +334,11 @@ inline void critical_line_tracker_3d_regular::update_timestep()
         });
 
     ftk::lattice ext({0, 0, 0}, 
-        {field_data_snapshots[0].uv.dim(1), 
-         field_data_snapshots[0].uv.dim(2),
-         field_data_snapshots[0].uv.dim(3)});
+        {field_data_snapshots[0].uv.dimf(1), 
+         field_data_snapshots[0].uv.dimf(2),
+         field_data_snapshots[0].uv.dimf(3)});
 
-    const int nchannels = field_data_snapshots[0].uv.dim(0);
+    const int nchannels = field_data_snapshots[0].uv.dimf(0);
 
     // ordinal
     auto results = extract_3dclt_cuda(

include/ftk/filters/critical_point_tracker_3d_regular.hh

@@ -240,9 +240,9 @@ inline void critical_point_tracker_3d_regular::update_timestep()
         });
 
     ftk::lattice ext({0, 0, 0}, 
-        {field_data_snapshots[0].vector.dim(1), 
-         field_data_snapshots[0].vector.dim(2),
-         field_data_snapshots[0].vector.dim(3)});
+        {field_data_snapshots[0].vector.dimf(1), 
+         field_data_snapshots[0].vector.dimf(2),
+         field_data_snapshots[0].vector.dimf(3)});
 
     // ordinal
     auto results = extract_cp3dt_cuda(

include/ftk/filters/particle_tracer_mpas_ocean.hh

@@ -330,7 +330,7 @@ inline void particle_tracer_mpas_ocean::push_field_data_snapshot(std::shared_ptr
     const double *attrs[] = {}; // salinity->data(), temperature->data()};
 
     // std::cerr << zTop->shape() << std::endl;
-    mop_set_nlayers(ctx, zTop->dim(1));
+    mop_set_nlayers(ctx, zTop->dimf(1));
 
 
     fprintf(stderr, "v=%p, vv=%p, top=%p\n", V->data(), vertVelocityTop->data(), zTop->data());

include/ftk/filters/tdgl_vortex_tracker_3d_regular.hh

@@ -299,9 +299,9 @@ inline void tdgl_vortex_tracker_3d_regular::update_timestep()
         });
 
     ftk::lattice ext({0, 0, 0}, 
-        {field_data_snapshots[0].rho.dim(0), 
-         field_data_snapshots[0].rho.dim(1),
-         field_data_snapshots[0].rho.dim(2)});
+        {field_data_snapshots[0].rho.dimf(0), 
+         field_data_snapshots[0].rho.dimf(1),
+         field_data_snapshots[0].rho.dimf(2)});
 
     // ordinal
     auto results = extract_tdgl_vortex_3dt_cuda(