BUG: decomposePar fails with csv table in binary (fixes #1498)

src/OpenFOAM/primitives/functions/Function1/CSV/CSV.C

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2016-2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2016-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -25,7 +25,6 @@ License
 
 #include "CSV.H"
 #include "DynamicList.H"
-//#include "IFstream.H"
 
 // * * * * * * * * * * * * * Private Member Functions  * * * * * * * * * * * //
 
@@ -33,7 +32,7 @@ template<>
 Foam::label Foam::Function1Types::CSV<Foam::label>::readValue
 (
     const List<string>& splitted
-)
+) const
 {
     if (componentColumns_[0] >= splitted.size())
     {
@@ -51,7 +50,7 @@ template<>
 Foam::scalar Foam::Function1Types::CSV<Foam::scalar>::readValue
 (
     const List<string>& splitted
-)
+) const
 {
     if (componentColumns_[0] >= splitted.size())
     {
@@ -66,7 +65,10 @@ Foam::scalar Foam::Function1Types::CSV<Foam::scalar>::readValue
 
 
 template<class Type>
-Type Foam::Function1Types::CSV<Type>::readValue(const List<string>& splitted)
+Type Foam::Function1Types::CSV<Type>::readValue
+(
+    const List<string>& splitted
+) const
 {
     Type result;
 
@@ -91,7 +93,6 @@ template<class Type>
 void Foam::Function1Types::CSV<Type>::read()
 {
     fileName expandedFile(fName_);
-    //IFstream is(expandedFile.expand());
     autoPtr<ISstream> isPtr(fileHandler().NewIFstream(expandedFile.expand()));
     ISstream& is = isPtr();
 
@@ -211,17 +212,24 @@ Foam::Function1Types::CSV<Type>::CSV
     TableBase<Type>(entryName, dict),
     nHeaderLine_(dict.get<label>("nHeaderLine")),
     refColumn_(dict.get<label>("refColumn")),
-    componentColumns_(dict.lookup("componentColumns")),
-    separator_(dict.lookupOrDefault<string>("separator", ",")[0]),
+    componentColumns_(),
+    separator_(dict.getOrDefault<string>("separator", ",")[0]),
     mergeSeparators_(dict.get<bool>("mergeSeparators")),
     fName_(fName.empty() ? dict.get<fileName>("file") : fName)
 {
+    // Writing of "componentColumns" was forced to be ASCII,
+    // do the same when reading
+    ITstream& is = dict.lookup("componentColumns");
+    is.format(IOstream::ASCII);
+    is >> componentColumns_;
+    dict.checkITstream(is, "componentColumns");
+
     if (componentColumns_.size() != pTraits<Type>::nComponents)
     {
-        FatalErrorInFunction
+        FatalIOErrorInFunction(dict)
             << componentColumns_ << " does not have the expected length of "
-            << pTraits<Type>::nComponents << endl
-            << exit(FatalError);
+            << pTraits<Type>::nComponents << nl
+            << exit(FatalIOError);
     }
 
     read();
@@ -243,13 +251,6 @@ Foam::Function1Types::CSV<Type>::CSV(const CSV<Type>& csv)
 {}
 
 
-// * * * * * * * * * * * * * * * * Destructor  * * * * * * * * * * * * * * * //
-
-template<class Type>
-Foam::Function1Types::CSV<Type>::~CSV()
-{}
-
-
 // * * * * * * * * * * * * * * * Member Functions  * * * * * * * * * * * * * //
 
 template<class Type>

src/OpenFOAM/primitives/functions/Function1/CSV/CSV.H

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011-2017 OpenFOAM Foundation
-     \\/     M anipulation  | Copyright (C) 2017 OpenCFD Ltd.
+     \\/     M anipulation  | Copyright (C) 2017-2019 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.
@@ -102,7 +102,7 @@ class CSV
         void read();
 
         //- Read the next value from the splitted string
-        Type readValue(const List<string>&);
+        Type readValue(const List<string>& splitted) const;
 
         //- No copy assignment
         void operator=(const CSV<Type>&) = delete;
@@ -135,7 +135,7 @@ public:
 
 
     //- Destructor
-    virtual ~CSV();
+    virtual ~CSV() = default;
 
 
     // Member Functions
@@ -148,13 +148,6 @@ public:
 };
 
 
-template<>
-label CSV<label>::readValue(const List<string>& splitted);
-
-template<>
-Foam::scalar CSV<scalar>::readValue(const List<string>& splitted);
-
-
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Function1Types

tutorials/combustion/reactingFoam/RAS/chockedNozzle/system/controlDict

@@ -32,7 +32,7 @@ writeInterval   0.02;
 
 purgeWrite      0;
 
-writeFormat     ascii;
+writeFormat     binary;
 
 writePrecision  10;