UGRID-43: Handle SWIGTYPE_P_<T>

cmake/cached_globals.cmake

@@ -21,14 +21,14 @@ set(GLOB_CURRENT_YEAR ${GLOB_CURRENT_YEAR} CACHE STRING "Current year")
 if(WIN32 AND BUILD_DOTNET_WRAPPER)
   # .NET SDK
   set(GLOB_DOTNET_SDK "Microsoft.NET.Sdk" CACHE STRING ".NET SDK")
-  # .NET target frameworks
+  # List of .NET target frameworks (semicolon-delimited)
   # Note: Even if the list consists of a single element, make sure to terminate with a semicolon
   #       For ex: set(LIST_OF_DOTNET_TARGET_FRAMEWORKS "net481;" CACHE STRING "Supported .NET target framework")
   #       Otherwise, Visual Studio will not create subdir net481 under Release (of whichever build config is used) in the CMake binary dir
   #       <TargetFramework>net481</TargetFramework> works (notice the singular form in xml element "TargetFramework")
   #       <TargetFrameworks>net481</TargetFrameworks> does not work (notice the plural form in xml element "TargetFrameworks")
   #       <TargetFrameworks>net481;</TargetFrameworks> works (notice the plural form in xml element "TargetFrameworks" and the semicolon after "net481")
-  set(GLOB_LIB_DOTNET_TARGET_FRAMEWORKS "netstandard2.0;net481" CACHE STRING "Library .NET target framework")
+  set(GLOB_LIB_DOTNET_TARGET_FRAMEWORKS "net481;netstandard2.0" CACHE STRING "Library .NET target framework")
   set(GLOB_TEST_DOTNET_TARGET_FRAMEWORKS "net481;" CACHE STRING "Test .NET target framework")
   # .NET language version
   set(GLOB_CSHARP_LANGUAGE_VERSION "7.3" CACHE STRING "C# Compiler Options for language feature rules") 

cmake/compiler_config.cmake

@@ -19,7 +19,7 @@ if (UNIX)
   endif()
 elseif(WIN32)
   if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/EHsc;/MP;/W3;/WX>")
+    add_compile_options("$<$<COMPILE_LANGUAGE:CXX>:/EHsc;/MP;/MD;/W3;/WX>")
     add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:RELEASE>>:/O2>")
     add_compile_options("$<$<AND:$<COMPILE_LANGUAGE:CXX>,$<CONFIG:DEBUG>>:/Od;/DEBUG>")
     add_compile_definitions("$<$<COMPILE_LANGUAGE:CXX>:_USE_MATH_DEFINES>")

cmake/user_config_options.cmake

@@ -25,7 +25,7 @@ option(
 cmake_dependent_option(
   PACK_NUPKG_LOCALLY
   "Pack the NuGet package locally. Should be used only to verify packages locally."
-  ON 
+  OFF
   "BUILD_DOTNET_WRAPPER"
   OFF
 )

libs/UGrid/src/Contacts.cpp

@@ -123,8 +123,8 @@ void Contacts::define(ugridapi::Contacts const& contacts)
     // Define topology attribute
     define_topological_attribute("cf_role", "mesh_topology_contact");
 
-    auto const mesh_from_location_string = from_location_integer_to_location_string(contacts.mesh_from_location);
-    auto const mesh_to_location_string = from_location_integer_to_location_string(contacts.mesh_to_location);
+    auto const mesh_from_location_string = from_location_integer_to_location_string(static_cast<int>(contacts.mesh_from_location));
+    auto const mesh_to_location_string = from_location_integer_to_location_string(static_cast<int>(contacts.mesh_to_location));
 
     // Define topology attribute from to mesh
     std::stringstream os;

libs/UGridAPI/CMakeLists.txt

@@ -28,6 +28,7 @@ set(
   ${DOMAIN_INC_DIR}/Contacts.hpp
   ${DOMAIN_INC_DIR}/Mesh1D.hpp
   ${DOMAIN_INC_DIR}/Mesh2D.hpp
+  ${DOMAIN_INC_DIR}/MeshLocations.hpp
   ${DOMAIN_INC_DIR}/Network1D.hpp
   ${DOMAIN_INC_DIR}/UGrid.hpp
   ${DOMAIN_INC_DIR}/UGridState.hpp

libs/UGridAPI/include/UGridAPI/Contacts.hpp

@@ -27,6 +27,8 @@
 
 #pragma once
 
+#include <UGridAPI/MeshLocations.hpp>
+
 namespace ugridapi
 {
     /// @brief A struct used to describe UGrid contact in a C-compatible manner
@@ -54,10 +56,10 @@ namespace ugridapi
         char* mesh_to_name = nullptr;
 
         /// @brief The location type (node, edge or face) at the contact start
-        int mesh_from_location = 0;
+        MeshLocations mesh_from_location = MeshLocations::Unknown;
 
         /// @brief The location type (node, edge or face) at the contact end
-        int mesh_to_location = 0;
+        MeshLocations mesh_to_location = MeshLocations::Unknown;
 
         /// @brief The number of contact
         int num_contacts = 0;

libs/UGridAPI/include/UGridAPI/MeshLocations.hpp

@@ -0,0 +1,50 @@
+//---- GPL ---------------------------------------------------------------------
+//
+// Copyright (C)  Stichting Deltares, 2011-2021.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation version 3.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+//
+// contact: delft3d.support@deltares.nl
+// Stichting Deltares
+// P.O. Box 177
+// 2600 MH Delft, The Netherlands
+//
+// All indications and logos of, and references to, "Delft3D" and "Deltares"
+// are registered trademarks of Stichting Deltares, and remain the property of
+// Stichting Deltares. All rights reserved.
+//
+//------------------------------------------------------------------------------
+
+#pragma once
+
+#ifndef UGRID_API
+#ifdef _WIN32
+#define UGRID_API __declspec(dllexport)
+#else
+#define UGRID_API __attribute__((visibility("default")))
+#endif
+#endif
+
+namespace ugridapi
+{
+
+    /// @brief MeshLocations locations
+    enum MeshLocations
+    {
+        Unknown = -1, ///< Unknown
+        Faces = 0,    ///< Faces
+        Nodes = 1,    ///< Nodes
+        Edges = 2,    ///< Edges
+    };
+
+} // namespace ugridapi