Merge pull request #251 from OpenSEMBA/dev

Propagates changes from PR#250 to main

Author: Alberto-o

.github/workflows/automatic-release-ubuntu-gnu.yml

@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix: 
         build-type: ["Release"]
-        mpi: ["No"]
-        mtln: ["Yes"]
-        hdf: ["Yes"]
+        mpi: ["OFF"]
+        mtln: ["ON"]
+        hdf: ["ON"]
 
     steps:       
     - name: Checkout

.github/workflows/automatic-release-windows-intelLLVM.yml

@@ -12,9 +12,9 @@ jobs:
     strategy:
       matrix: 
         build-type: ["Release"]
-        mpi: ["No"]
-        mtln: ["Yes"]
-        hdf: ["Yes"]
+        mpi: ["OFF"]
+        mtln: ["ON"]
+        hdf: ["ON"]
 
     steps:
 

.github/workflows/ubuntu.yml

@@ -25,44 +25,28 @@ jobs:
           {name: 'gcc', version: 11}
         ]
         build-type: ["Release"]
-        mpi: ["Yes", "No"]
-        mtln: ["Yes", "No"]
-        hdf: ["Yes"]
-        double-precision: ["No"]
+        mpi: ["ON", "OFF"]
+        mtln: ["ON", "OFF"]
+        hdf: ["ON"]
+        double-precision: ["OFF"]
 
         include:
-          - os: ubuntu-22.04
-            compiler: {name: 'intel-classic', version: '2021.10'}
-            build-type: "Release"
-            mpi: "No"
-            mtln: "No"
-            hdf: "Yes"
-            double-precision: "No"
-
-          # - os: ubuntu-22.04
-          #   compiler: {name: 'intel-classic', version: '2021.10'}
-          #   build-type: "Release"
-          #   mpi: "No"
-          #   mtln: "Yes"
-          #   hdf: "Yes"
-          #   double-precision: "No"
-          
           # Disable by lack of space on github action
           # - os: ubuntu-latest
           #   compiler: {name: 'nvidia-hpc', version: '24.5'}
           #   build-type: "Release"
-          #   mpi: "No"
-          #   mtln: "No"
-          #   hdf: "No"
-          #   double-precision: "No"
+          #   mpi: "OFF"
+          #   mtln: "OFF"
+          #   hdf: "OFF"
+          #   double-precision: "OFF"
 
           - os: ubuntu-latest # This is the only test with double precision.
             compiler: {name: 'intel', version: '2025.1'}
             build-type: "Release"
-            mpi: "Yes"
-            mtln: "No"
-            hdf: "Yes"
-            double-precision: "Yes"
+            mpi: "ON"
+            mtln: "OFF"
+            hdf: "ON"
+            double-precision: "ON"
 
       fail-fast: false
 
@@ -80,7 +64,7 @@ jobs:
       run: python -m pip install -r requirements.txt
 
     - name: Setup MPI
-      if: matrix.mpi=='Yes' && matrix.compiler.name=='intel'
+      if: matrix.mpi=='ON' && matrix.compiler.name=='intel'
       uses: mpi4py/setup-mpi@v1
       with:
         mpi: 'intelmpi'

.github/workflows/windows.yml

@@ -24,10 +24,10 @@ jobs:
         os: [windows-latest]
         compiler: [ {name: 'intel', version: '2025.0'} ]
         build-type: ["Release"]
-        mpi: ["No"]
-        mtln: ["Yes", "No"]
-        hdf: ["Yes"]
-        double-precision: ["Yes", "No"]
+        mpi: ["OFF"]
+        mtln: ["ON", "OFF"]
+        hdf: ["ON"]
+        double-precision: ["ON", "OFF"]
 
       fail-fast: false
     runs-on: ${{matrix.os}}

CMakeLists.txt

@@ -21,13 +21,12 @@ option(SEMBA_FDTD_ENABLE_DOUBLE_PRECISION "Use double precision (CompileWithReal
 option(SEMBA_FDTD_ENABLE_TEST "Compile tests" ON)
 
 option(SEMBA_FDTD_ENABLE_INTEL_XHOST_OPTIMIZATION "When compiling in Release, enables the -xHost optimization flag (not supported in github actions)" OFF) 
-option(SEMBA_FDTD_ENABLE_INTEL_IPO "When compiling in Release, enables the interprocedural optimization" ON)
+option(SEMBA_FDTD_ENABLE_INTEL_IPO "When compiling in Release, enables the interprocedural optimization" OFF)
 
 option(SEMBA_FDTD_EXECUTABLE "Compiles executable" ON)
 option(SEMBA_FDTD_MAIN_LIB "Compiles main library" ON)
 option(SEMBA_FDTD_COMPONENTS_LIB "Compiles components library" ON)
 option(SEMBA_FDTD_OUTPUTS_LIB "Compiles outputs library" ON)
-
 # Compilation defines.
 if(SEMBA_FDTD_ENABLE_SMBJSON)
 	add_definitions(-DCompileWithSMBJSON)
@@ -156,6 +155,7 @@ add_library(semba-types
 	"src_main_pub/nfde_types.F90"
 	"src_main_pub/fdetypes.F90"
 	"src_mtln/mtln_types.F90"
+	"src_conformal/conformal_types.F90"
 	"src_wires_pub/wires_types.F90"
 	"src_main_pub/lumped_types.F90"
 )
@@ -186,6 +186,9 @@ if (SEMBA_FDTD_ENABLE_MTLN)
 	endif()
 endif()
 
+add_subdirectory(src_conformal)
+set(CONFORMAL_LIBRARIES conformal)
+
 if (SEMBA_FDTD_ENABLE_TEST)
 	add_subdirectory(external/googletest/)
 	add_subdirectory(test)

CMakePresets.json

@@ -22,7 +22,7 @@
       "inherits": "dbg",
       "binaryDir": "build-dbg-nomtln/",
       "cacheVariables": {
-        "SEMBA_FDTD_ENABLE_MTLN": "No"
+        "SEMBA_FDTD_ENABLE_MTLN": "OFF"
       }
     }
   ]

doc/development.md

@@ -29,7 +29,7 @@ You can compile HDF5 for your specific platform downloading the latest sources f
 Extract to a folder and build and install with the following commands
 
 ```shell
-  cmake -S . -B build -DHDF5_BUILD_FORTRAN=YES -DHDF5_ENABLE_Z_LIB_SUPPORT=NO --fresh
+  cmake -S . -B build -DHDF5_BUILD_FORTRAN=ON -DHDF5_ENABLE_Z_LIB_SUPPORT=NO --fresh
   cmake --build build -j 
   cmake --install build --prefix ~/hdf5-installed 
 ```
@@ -110,10 +110,10 @@ Open a command prompt with OneAPI variables initialised, to do this open a new c
 
 This will load the OneAPI environment for x64.
 
-Navigate to the fdtd root folder, choose between "Debug"/"Release" for `-DCMAKE_BUILD_TYPE`, and "Yes"/"No" for `-DSEMBA_FDTD_ENABLE_MPI`, for example, a Release version with MPI Support would be:
+Navigate to the fdtd root folder, choose between "Debug"/"Release" for `-DCMAKE_BUILD_TYPE`, and "ON"/"OFF" for `-DSEMBA_FDTD_ENABLE_MPI`, for example, a Release version with MPI Support would be:
 
 ```shell
-cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DSEMBA_FDTD_ENABLE_MPI=Yes
+cmake -S . -B build -GNinja -DCMAKE_BUILD_TYPE=Release -DSEMBA_FDTD_ENABLE_MPI=ON
 ```
 
 Then,

doc/smbjson.md

@@ -169,6 +169,10 @@ The `elements` entry contains an array of JSON objects, each of which represents
   + `node`, representing a point in space. Elements with this type include a `<coordinateIds>` entry which is an array of a single integer representing the `id` of a coordinate and which must exist in the within the `mesh` `coordinates` list.
   + `polyline`, representing an oriented collection of segments. It must contain a list `<coordinateIds>` with at least two coordinates.
   + `cell`, containing a list of one or more `<intervals>` defined following the [interval convention](#the-interval-convention).
+  + + If `cell` represents a conformal element it will contain a list of zero or more <intervals> and a list of <triangles>,  describing a close outwards-pointing surface. 
+  + + In this case, the `cell` must contain an entry `subtype`, which can be `surface` or `volume`, according to the dimension of the geometrical entity.
+
+
 
 Below there is an example of a mesh object which includes several types of elements.
 
@@ -187,6 +191,7 @@ Below there is an example of a mesh object which includes several types of eleme
         {"id": 1, "type": "node", "coordinateIds": [2]},
         {"id": 2, "type": "polyline", "coordinateIds": [1, 2, 3] },
         {"id": 3, "type": "cell", "intervals": [ [ [1, 1, 1], [19, 19, 21] ] ] }
+        {"id": 4, "type": "conformalVolume", "intervals": [ [ [1, 1, 1], [19, 19, 21] ] ], "triangles" : [[1,2,3]] }
     ]
 }
 ```
@@ -237,6 +242,9 @@ An interval allows specifying regions within the grid which can be a point, an o
     ]
 }
 ```
+##### Triangles
+
+Each triangle is a list of three `<coordinateId>`, representing the vertices of the triangle. Vertices have to be oriented so the normal of each triangle points outwards the volume. 
 
 ## `[materials]`
 This entry is an array formed by all the physical models contained in the simulation. Each object within the array must contain:

src_conformal/CMakeLists.txt

@@ -0,0 +1,11 @@
+message(STATUS "Creating build system for conformal")
+
+set(CMAKE_Fortran_MODULE_DIRECTORY ${CMAKE_BINARY_DIR}/mod)
+
+add_library(conformal 
+	"cell_map.F90"
+    "conformal.F90"
+    "geometry.F90"
+)
+
+target_link_libraries(conformal PRIVATE semba-types fhash)