Forgot to handle 2D and 3D cases differently in one place

actions/actiongenintfile.h

@@ -178,8 +178,8 @@ MString ActionGenIntFile_DoAction(const CLArgs& args, D& ds)
   if(is2D)
   {
    auto retu = ad.Read2D(uvar, ind[it]);
-   auto retv = ad.Read2D(vvar, ind[it]);
    if(!retu) return "Can't read U data";
+   auto retv = ad.Read2D(vvar, ind[it]);
    if(!retv) return "Can't read V data";
    udata2 = retu.Value();
    vdata2 = retv.Value();
@@ -187,8 +187,8 @@ MString ActionGenIntFile_DoAction(const CLArgs& args, D& ds)
   else
   {
    auto retu = ad.Read3D(uvar, ind[it]);
-   auto retv = ad.Read3D(vvar, ind[it]);
    if(!retu) return "Can't read U data";
+   auto retv = ad.Read3D(vvar, ind[it]);
    if(!retv) return "Can't read V data";
    udata3 = retu.Value();
    vdata3 = retv.Value();

src/Adapter.cpp

@@ -192,7 +192,8 @@ RetVal<std::shared_ptr<Data3D>> Adapter::Def3DReader(const Adapter& ad, const st
   {
    xreq = ri->xdname + ":" + ri->xb + ":" + (nx - ri->xb);
 
-   auto ret = needsconvert ? ad.nc->Read(v->name, data, cnvtrans, req()) : ad.nc->Read(v->name, data, trans, req());
+   auto ret = needsconvert ? (onez ? ad.nc->Read(v->name, data2D, cnvtrans, req()) : ad.nc->Read(v->name, data, cnvtrans, req()))
+                           : (onez ? ad.nc->Read(v->name, data2D, trans, req()) : ad.nc->Read(v->name, data, trans, req()));
    if(!ret) return ret.Add(pref, "Can't read variable " + v->name);
   }
   {