[MOAB-dev] r5585 - in MOAB/trunk: MeshFiles/unittest/io src/io test/io test/parallel

[Steve Jackson]

In my non-parallel MOAB build, r5585 gives me compile errors:

> ../../../../code/src/io/ReadNC.cpp: In member function ‘moab::ErrorCode moab::ReadNC::read_variable_allocate(moab::EntityHandle, std::vector<moab::ReadNC::VarData, std::allocator<moab::ReadNC::VarData> >&, std::vector<int, std::allocator<int> >&)’:
> ../../../../code/src/io/ReadNC.cpp:840: error: ‘myPcomm’ was not declared in this scope

It looks like some uses of this variable are not correctly guarded by #ifdef USE_MPI.  I'm not sure where the guard statements should be placed, so I won't attempt to fix it myself.
~S

On Jun 22, 2012, at 13:00 , xbxu at mcs.anl.gov wrote:

> Author: xbxu
> Date: 2012-06-22 14:00:40 -0500 (Fri, 22 Jun 2012)
> New Revision: 5585
> 
> Added:
>   MOAB/trunk/MeshFiles/unittest/io/camEul26x48x96.t3.nc
> Removed:
>   MOAB/trunk/MeshFiles/unittest/io/cam18x40x48.t2.nc
> Modified:
>   MOAB/trunk/MeshFiles/unittest/io/Makefile.am
>   MOAB/trunk/src/io/ReadNC.cpp
>   MOAB/trunk/src/io/ReadNC.hpp
>   MOAB/trunk/test/io/read_nc.cpp
>   MOAB/trunk/test/parallel/Makefile.am
>   MOAB/trunk/test/parallel/scdpart.cpp
> Log:
> merge the branch nc_to_2.5d back to trunk
> 
> Modified: MOAB/trunk/MeshFiles/unittest/io/Makefile.am
> ===================================================================
> --- MOAB/trunk/MeshFiles/unittest/io/Makefile.am	2012-06-20 16:51:10 UTC (rev 5584)
> +++ MOAB/trunk/MeshFiles/unittest/io/Makefile.am	2012-06-22 19:00:40 UTC (rev 5585)
> @@ -1,7 +1,7 @@
> EXTRA_DIST = brick_cubit10.1.cub \
>              brick_cubit10.2.cub \
>              brick_cubit10.cub \
> -	     cam18x40x48.t2.nc \
> +             camEul26x48x96.t3.nc \
> 	     cubtest12.cub \
> 	     cubtest.jou \
> 	     dum.sat \
> 
> Deleted: MOAB/trunk/MeshFiles/unittest/io/cam18x40x48.t2.nc
> ===================================================================
> (Binary files differ)
> 
> Added: MOAB/trunk/MeshFiles/unittest/io/camEul26x48x96.t3.nc
> ===================================================================
> (Binary files differ)
> 
> 
> Property changes on: MOAB/trunk/MeshFiles/unittest/io/camEul26x48x96.t3.nc
> ___________________________________________________________________
> Added: svn:mime-type
>   + application/octet-stream
> 
> Modified: MOAB/trunk/src/io/ReadNC.cpp
> ===================================================================
> --- MOAB/trunk/src/io/ReadNC.cpp	2012-06-20 16:51:10 UTC (rev 5584)
> +++ MOAB/trunk/src/io/ReadNC.cpp	2012-06-22 19:00:40 UTC (rev 5585)
> @@ -5,6 +5,7 @@
> #include <stdio.h>
> #include <string.h>
> #include <cmath>
> +#include <cstdlib>
> #include <iostream>
> #include <sstream>
> #include <map>
> @@ -30,10 +31,13 @@
> ReadNC::ReadNC(Interface* impl)
>         : mbImpl(impl), CPU_WORD_SIZE(-1), IO_WORD_SIZE(-1), fileId(-1), 
>           tMin(-1), tMax(-1),
> -          iDim(-1), jDim(-1), kDim(-1), tDim(-1), numUnLim(-1), mCurrentMeshHandle(0),
> +	  iDim(-1), jDim(-1), tDim(-1), iCDim(-1), jCDim(-1),
> +	  numUnLim(-1), mCurrentMeshHandle(0),
>           startVertex(0), startElem(0), mGlobalIdTag(0), 
>           max_line_length(-1), max_str_length(-1), vertexOffset(0), dbgOut(stderr),
> -          isParallel(false), partMethod(-1), ucdMesh(false)
> +          isParallel(false), partMethod(-1), ucdMesh(false),