COMP: some low-level darwin-related patches

- a partial selection from https://github.com/mrklein/openfoam-os-x
  with adjustments. The primary purpose is to reduce header-level
  incompatibilities and to provide a common set of make rules to allow
  easier patching (or re-integration).

etc/config.csh/settings

@@ -103,6 +103,11 @@ case Linux:
     endsw
     breaksw
 
+case Darwin:    # Presumably x86_64
+    if (! $?WM_ARCH_OPTION ) setenv WM_ARCH_OPTION 64  # Default to 64-bit
+    setenv WM_ARCH darwin64
+    breaksw
+
 case SunOS:
     setenv WM_ARCH SunOS64
     setenv WM_MPLIB FJMPI

etc/config.sh/settings

@@ -97,6 +97,11 @@ Linux)
     esac
     ;;
 
+Darwin)     # Presumably x86_64
+    : ${WM_ARCH_OPTION:=64}; export WM_ARCH_OPTION  # Default to 64-bit
+    WM_ARCH=darwin64
+    ;;
+
 SunOS)
     WM_ARCH=SunOS64
     WM_MPLIB=FJMPI

src/OSspecific/POSIX/POSIX.C

@@ -1547,6 +1547,15 @@ void* Foam::dlOpen(const fileName& lib, const bool check)
     }
     void* handle = ::dlopen(lib.c_str(), RTLD_LAZY|RTLD_GLOBAL);
 
+    #ifdef darwin
+    // Re-try "libXX.so" as "libXX.dylib"
+    if (!handle && lib.hasExt("so"))
+    {
+        const fileName dylib(lib.lessExt().ext("dylib"));
+        handle = ::dlopen(dylib.c_str(), RTLD_LAZY|RTLD_GLOBAL);
+    }
+    #endif
+
     if (!handle && check)
     {
         WarningInFunction
@@ -1631,6 +1640,7 @@ bool Foam::dlSymFound(void* handle, const std::string& symbol)
 }
 
 
+#ifndef darwin
 static int collectLibsCallback
 (
     struct dl_phdr_info *info,
@@ -1643,12 +1653,21 @@ static int collectLibsCallback
     ptr->append(info->dlpi_name);
     return 0;
 }
+#endif
 
 
 Foam::fileNameList Foam::dlLoaded()
 {
     DynamicList<fileName> libs;
+    #ifdef darwin
+    for (uint32_t i=0; i < _dyld_image_count(); ++i)
+    {
+       libs.append(_dyld_get_image_name(i));
+    }
+    #else
     dl_iterate_phdr(collectLibsCallback, &libs);
+    #endif
+
     if (POSIX::debug)
     {
         std::cout

src/OSspecific/POSIX/clockValue/clockValue.H

@@ -37,6 +37,9 @@ SourceFiles
 #define clockValue_H
 
 #include <sys/types.h>
+#ifdef darwin
+    #include <sys/time.h>
+#endif
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 

src/OSspecific/POSIX/endian.H

@@ -40,7 +40,9 @@ SourceFiles
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
-#ifdef __GNUC__
+#ifdef darwin
+    #include <machine/endian.h>
+#elif defined __GNUC__
     #include <endian.h>
 #elif defined __mips
     #include <standards.h>

src/OSspecific/POSIX/printStack.C

@@ -87,7 +87,11 @@ string pOpen(const string& cmd, label line=0)
 inline word addressToWord(const uintptr_t addr)
 {
     OStringStream os;
+    #ifdef darwin
+    os << "0x" << hex << uint64_t(addr);
+    #else
     os << "0x" << hex << addr;
+    #endif
     return os.str();
 }
 

src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.C

@@ -315,7 +315,11 @@ Foam::fileName Foam::dynamicCode::codeRelPath() const
 
 Foam::fileName Foam::dynamicCode::libRelPath() const
 {
+    #ifdef darwin
+    return codeRelPath()/libSubDir_/"lib" + codeName_ + ".dylib";
+    #else
     return codeRelPath()/libSubDir_/"lib" + codeName_ + ".so";
+    #endif
 }
 
 

src/OpenFOAM/db/dynamicLibrary/dynamicCode/dynamicCode.H

@@ -44,7 +44,7 @@ SourceFiles
 namespace Foam
 {
 
-// Forward declaration of classes
+// Forward declarations
 class dynamicCodeContext;
 class ISstream;
 class OSstream;
@@ -92,11 +92,11 @@ private:
 
     // Private Member Functions
 
-        //- Disallow default bitwise copy construct
+        //- No copy construct
-        dynamicCode(const dynamicCode&);
+        dynamicCode(const dynamicCode&) = delete;
 
-        //- Disallow default bitwise assignment
+        //- No copy assignment
-        void operator=(const dynamicCode&);
+        void operator=(const dynamicCode&) = delete;
 
 
 protected:
@@ -221,7 +221,11 @@ public:
         //  Corresponds to codeRoot()/libSubDir()/lib\<codeName\>.so
         fileName libPath() const
         {
+            #ifdef darwin
+            return codeRoot_/libSubDir_/"lib" + codeName_ + ".dylib";
+            #else
             return codeRoot_/libSubDir_/"lib" + codeName_ + ".so";
+            #endif
         }
 
         //- Path for specified code name relative to \$FOAM_CASE

src/OpenFOAM/primitives/Scalar/Scalar.H

@@ -166,11 +166,10 @@ transFunc(erfc)
 transFunc(lgamma)
 transFunc(tgamma)
 
-transFunc(j0)
+besselFunc(j0)
-transFunc(j1)
+besselFunc(j1)
-
+besselFunc(y0)
-transFunc(y0)
+besselFunc(y1)
-transFunc(y1)
 
 
 inline Scalar& setComponent(Scalar& s, const direction)

src/OpenFOAM/primitives/Scalar/doubleFloat.H

@@ -3,7 +3,7 @@
   \\      /  F ield         | OpenFOAM: The Open Source CFD Toolbox
    \\    /   O peration     |
     \\  /    A nd           | Copyright (C) 2011 OpenFOAM Foundation
-     \\/     M anipulation  |
+     \\/     M anipulation  | Copyright (C) 2018 OpenCFD Ltd.
 -------------------------------------------------------------------------------
 License
     This file is part of OpenFOAM.

src/OpenFOAM/primitives/Scalar/doubleScalar/doubleScalar.H

@@ -100,6 +100,15 @@ inline Scalar func(const Scalar s) \
     return ::func(s);              \
 }
 
+
+// Double-precision bessel functions
+#define besselFunc(func)           \
+inline Scalar func(const Scalar s) \
+{                                  \
+    return ::func(s);              \
+}
+
+
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
 } // End namespace Foam
@@ -115,6 +124,7 @@ inline Scalar func(const Scalar s) \
 #undef ScalarROOTVSMALL
 #undef ScalarRead
 #undef transFunc
+#undef besselFunc
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

src/OpenFOAM/primitives/Scalar/floatScalar/floatScalar.H

@@ -83,6 +83,41 @@ inline Scalar atan2(const Scalar y, const Scalar x)
     return ::atan2f(y, x);
 }
 
+// Single-precision transcendental functions (with 'f' appended to the name)
+#define transFunc(func)            \
+inline Scalar func(const Scalar s) \
+{                                  \
+    return ::func##f(s);           \
+}
+
+
+#ifdef darwin
+// Single-precision bessel functions. (No float version for darwin).
+#define besselFunc(func)           \
+inline Scalar func(const Scalar s) \
+{                                  \
+    return ::func(s);              \
+}
+
+inline Scalar jn(const int n, const Scalar s)
+{
+    return Scalar(::jn(n, double(s)));
+}
+
+inline Scalar yn(const int n, const Scalar s)
+{
+    return Scalar(::yn(n, double(s)));
+}
+
+#else
+
+// Single-precision bessel functions (with 'f' appended to the name)
+#define besselFunc(func)           \
+inline Scalar func(const Scalar s) \
+{                                  \
+    return ::func##f(s);           \
+}
+
 inline Scalar jn(const int n, const Scalar s)
 {
     return ::jnf(n, s);
@@ -93,12 +128,8 @@ inline Scalar yn(const int n, const Scalar s)
     return ::ynf(n, s);
 }
 
-// Single-precision transcendental functions (with 'f' appended to the name)
+#endif
-#define transFunc(func)            \
+
-inline Scalar func(const Scalar s) \
-{                                  \
-    return ::func##f(s);           \
-}
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
 
@@ -115,6 +146,7 @@ inline Scalar func(const Scalar s) \
 #undef ScalarROOTVSMALL
 #undef ScalarRead
 #undef transFunc
+#undef besselFunc
 
 
 // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //

wmake/rules/darwin64Clang/c

@@ -0,0 +1,16 @@
+SUFFIXES += .c
+
+cc          = clang -m64 -Ddarwin
+
+cWARN       = -Wall
+
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -Wl,-dylib,-undefined,dynamic_lookup
+LINKEXE     = $(cc) -Wl,-execute,-undefined,dynamic_lookup

wmake/rules/darwin64Clang/c++

@@ -0,0 +1,17 @@
+include $(GENERAL_RULES)/Clang/c++
+
+CC          = clang++ -std=c++11 -m64 -Ddarwin
+
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -Wl,-dylib,-undefined,dynamic_lookup
+LINKEXE     = $(CC) $(c++FLAGS) -Wl,-execute,-undefined,dynamic_lookup

wmake/rules/darwin64Clang/c++Debug

@@ -0,0 +1,2 @@
+c++DBUG     = -g -DFULLDEBUG
+c++OPT      = -O0

wmake/rules/darwin64Clang/c++Opt

@@ -0,0 +1,2 @@
+c++DBUG     =
+c++OPT      = -O3

wmake/rules/darwin64Clang/c++Prof

@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2

wmake/rules/darwin64Clang/cDebug

@@ -0,0 +1,2 @@
+cDBUG       = -g -DFULLDEBUG
+cOPT        = -O0

wmake/rules/darwin64Clang/cOpt

@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3

wmake/rules/darwin64Clang/cProf

@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2

wmake/rules/darwin64Clang/general

@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS) -Ddarwin
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+include $(GENERAL_RULES)/Clang/openmp
+
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++

wmake/rules/darwin64Gcc/c

@@ -0,0 +1,16 @@
+SUFFIXES += .c
+
+cc          = gcc -m64 -Ddarwin
+
+cWARN       = -Wall
+
+include $(DEFAULT_RULES)/c$(WM_COMPILE_OPTION)
+
+cFLAGS      = $(GFLAGS) $(cWARN) $(cOPT) $(cDBUG) $(LIB_HEADER_DIRS) -fPIC
+
+ctoo        = $(WM_SCHEDULER) $(cc) $(cFLAGS) -c $< -o $@
+
+LINK_LIBS   = $(cDBUG)
+
+LINKLIBSO   = $(cc) -Wl,-dylib,-undefined,dynamic_lookup
+LINKEXE     = $(cc) -Wl,-execute,-undefined,dynamic_lookup

wmake/rules/darwin64Gcc/c++

@@ -0,0 +1,17 @@
+include $(GENERAL_RULES)/Gcc/c++
+
+CC          = g++ -std=c++11 -m64 -Ddarwin
+
+include $(DEFAULT_RULES)/c++$(WM_COMPILE_OPTION)
+
+c++FLAGS    = $(GFLAGS) $(c++WARN) $(c++OPT) $(c++DBUG) $(ptFLAGS) $(LIB_HEADER_DIRS) -fPIC
+
+Ctoo        = $(WM_SCHEDULER) $(CC) $(c++FLAGS) -c $< -o $@
+cxxtoo      = $(Ctoo)
+cctoo       = $(Ctoo)
+cpptoo      = $(Ctoo)
+
+LINK_LIBS   = $(c++DBUG)
+
+LINKLIBSO   = $(CC) $(c++FLAGS) -Wl,-dylib,-undefined,dynamic_lookup
+LINKEXE     = $(CC) $(c++FLAGS) -Wl,-execute,-undefined,dynamic_lookup

wmake/rules/darwin64Gcc/c++Debug

@@ -0,0 +1,2 @@
+c++DBUG     = -ggdb3 -DFULLDEBUG
+c++OPT      = -O0 -fdefault-inline

wmake/rules/darwin64Gcc/c++Opt

@@ -0,0 +1,4 @@
+c++DBUG     =
+c++OPT      = -O3
+
+ROUNDING_MATH = -frounding-math

wmake/rules/darwin64Gcc/c++Prof

@@ -0,0 +1,2 @@
+c++DBUG    = -pg
+c++OPT     = -O2

wmake/rules/darwin64Gcc/cDebug

@@ -0,0 +1,2 @@
+cDBUG       = -ggdb -DFULLDEBUG
+cOPT        = -O1 -fdefault-inline -finline-functions

wmake/rules/darwin64Gcc/cOpt

@@ -0,0 +1,2 @@
+cDBUG       =
+cOPT        = -O3

wmake/rules/darwin64Gcc/cProf

@@ -0,0 +1,2 @@
+cDBUG       = -pg
+cOPT        = -O2

wmake/rules/darwin64Gcc/general

@@ -0,0 +1,9 @@
+CPP        = cpp -traditional-cpp $(GFLAGS) -Ddarwin
+
+PROJECT_LIBS = -l$(WM_PROJECT) -ldl
+
+include $(GENERAL_RULES)/standard
+include $(GENERAL_RULES)/Gcc/openmp
+
+include $(DEFAULT_RULES)/c
+include $(DEFAULT_RULES)/c++

wmake/wmake

@@ -110,7 +110,9 @@ make="make"
 nCores=0
 allCores()
 {
-    nCores=$(egrep -c "^processor" /proc/cpuinfo 2>/dev/null) || nCores=1
+    nCores=$(egrep -c "^processor" /proc/cpuinfo 2>/dev/null) || \
+    nCores=$(getconf _NPROCESSORS_ONLN 2>/dev/null) || \
+    nCores=1
     : ${nCores:=1}
 }