Merging dev into main

.github/workflows/ubuntu-gnu.yml

@@ -0,0 +1,66 @@
+name: ubuntu-gnu
+
+on:
+  push:
+    branches:
+      - luis
+      - alejandro
+
+  pull_request:
+    branches:
+      - main
+      - dev
+
+jobs:
+
+  builds-and-test:
+    runs-on: ubuntu-latest
+
+    steps:       
+    - name: Checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+
+    - name: Setup vcpkg
+      uses: lukka/run-vcpkg@v11
+
+    - name: Setup Ninja
+      uses: ashutoshvarma/setup-ninja@master
+
+    # - name: Builds mfem-geg
+    #   run: | 
+    #     cmake -S external/mfem-geg \
+    #           -B mfem-geg-build/ \
+    #           -DCMAKE_BUILD_TYPE=Release \
+    #           -DCMAKE_INSTALL_PREFIX=mfem-geg-install \
+    #           -G Ninja
+    #     cmake --build mfem-geg-build/ -j
+    #     cmake --install mfem-geg-build/
+
+    - name: Builds semba/dgtd
+      uses: lukka/run-cmake@v10
+      with:
+        configurePreset: 'gnu'
+        buildPreset: 'gnu'
+        buildPresetAdditionalArgs: "['--parallel']"
+
+    - name: Run hesthavenComparison tests 
+      run: build/gnu/bin/hesthavenComparison_tests
+
+    - name: Run mfem tests 
+      run: build/gnu/bin/mfem_tests
+
+    - name: Run maxwell tests 
+      run: build/gnu/bin/maxwell_tests
+
+    - name: Run maxwell solver tests
+      run: build/gnu/bin/maxwell_solver_tests
+
+    # - name: Run system tests 
+    #   run: |
+    #     build/gnu/bin/cases_tests
+    #     build/gnu/bin/rcs_tests
+
+
+

.github/workflows/windows-msvc.yml

@@ -0,0 +1,68 @@
+name: windows-msvc
+
+permissions:
+  actions: write
+
+on:
+  push:
+    branches:
+      - main
+      - alejandro
+
+  pull_request:
+    branches:
+      - main
+      - dev
+
+
+jobs:
+  builds-and-tests:
+
+    runs-on: windows-latest
+
+    steps:
+
+    - name: checkout
+      uses: actions/checkout@v4
+      with:
+        submodules: 'recursive'
+
+    - name: getcmake
+      uses: lukka/get-cmake@latest
+
+    - name: Setup vcpkg
+      uses: lukka/run-vcpkg@v11
+
+    - name: Setup Ninja
+      uses: ashutoshvarma/setup-ninja@master
+
+    # - name: Builds mfem-geg
+    #   run: | 
+    #     cmake -S external/mfem-geg -B mfem-geg-build/ -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=mfem-geg-install -G Ninja
+    #     cmake --build mfem-geg-build/ -j --config Release
+    #     cmake --install mfem-geg-build/ --config Release
+
+    - name: Builds semba/dgtd
+      uses: lukka/run-cmake@v10
+      env: 
+        MFEM_DIR: 'mfem-geg-install/lib/cmake/mfem/'
+      with:
+        configurePreset: 'gnu'
+        buildPreset: 'gnu'
+        buildPresetAdditionalArgs: "['--parallel']"
+
+    - name: Run unit tests 
+      run: |
+        build/gnu/bin/hesthavenComparison_tests
+        build/gnu/bin/mfem_tests
+        build/gnu/bin/maxwell_tests
+
+    # - name: Run system tests 
+    #   run: |
+    #     build/gnu/bin/cases_tests
+    #     build/gnu/bin/maxwell_solver_tests
+    #     build/gnu/bin/rcs_tests
+
+
+
+

.gitignore

@@ -1,6 +1,11 @@
 .vs/
+.vscode/
+
+build/
 out/
 ParaView/
+NearToFarFieldExports/
+resources/*.msh
 
 *.csv
 *.gf
@@ -46,40 +51,10 @@ mesh.mesh
 .vs/*
 out/*
 /CMakeSettings.json
-/tnf_sym_9.txt
-/tnf_sym_8.txt
-/tnf_sym_7.txt
-/tnf_sym_6.txt
-/tnf_sym_5.txt
-/tnf_sym_4.txt
-/tnf_sym_3.txt
-/tnf_sym_2.txt
-/tnf_sym_11.txt
-/tnf_sym_10.txt
-/tnf_sym_1.txt
-/tnf_sym_0.txt
-/tnf_9.txt
-/tnf_8.txt
-/tnf_7.txt
-/tnf_6.txt
-/tnf_5.txt
-/tnf_4.txt
-/tnf_3.txt
-/tnf_2.txt
-/tnf_11.txt
-/tnf_10.txt
-/tnf_1.txt
-/tnf_0.txt
-/fss_sym_9.txt
-/fss_sym_8.txt
-/fss_sym_7.txt
-/fss_sym_6.txt
-/fss_sym_5.txt
-/fss_sym_4.txt
-/fss_sym_3.txt
-/fss_sym_2.txt
-/fss_sym_11.txt
-/fss_sym_10.txt
-/fss_sym_1.txt
-/fss_sym_0.txt
 .vscode/settings.json
+/SpaceSwapping/L2toND
+/testData/dftData
+
+
+CMakeUserPresets.json
+/dotvs_backup

.gitmodules

@@ -1,9 +1,7 @@
 [submodule "pythonBindings/pybind11"]
 	path = pythonBindings/pybind11
 	url = [email protected]:pybind/pybind11.git
-[submodule "external/opensemba-core"]
-	path = external/opensemba-core
-	url = [email protected]:OpenSEMBA/core.git
 [submodule "external/mfem-geg"]
 	path = external/mfem-geg
 	url = [email protected]:OpenSEMBA/mfem.git
+	ignore = dirty

CITATION.cff

@@ -0,0 +1,21 @@
+cff-version: 1.2.0
+message: "If you use this software, please cite it as below."
+authors:
+  - family-names: García
+    given-names: Salvador G.
+    orcid: https://orcid.org/0000-0001-7317-1423
+  - family-names: Angulo
+    given-names: Luis D.
+    orcid: https://orcid.org/0000-0002-1690-7892
+  - family-names: Muñoz
+    given-names: Alejandro 
+    orcid: https://orcid.org/0000-0002-2406-8128
+  - family-names: Gascón
+    given-names: Alberto 
+    orcid: https://orcid.org/0000-0003-1190-2248
+  - family-names: Mazariegos
+    given-names: Farah Amador 
+    orcid: https://orcid.org/0009-0009-4591-9313
+url: "https://github.com/opensemba/dgtd"
+title: "semba-dgtd"
+date-released: 2024-01-01

CMakeLists.txt

@@ -1,12 +1,4 @@
-cmake_minimum_required(VERSION 3.0)
-
-if(NOT DEFINED _VCPKG_INSTALLED_DIR AND DEFINED ENV{_VCPKG_INSTALLED_DIR})
-   set(_VCPKG_INSTALLED_DIR $ENV{_VCPKG_INSTALLED_DIR})
-endif()
-
-if(NOT DEFINED CMAKE_TOOLCHAIN_FILE AND DEFINED ENV{CMAKE_TOOLCHAIN_FILE})
-   set(CMAKE_TOOLCHAIN_FILE $ENV{CMAKE_TOOLCHAIN_FILE})
-endif()
+cmake_minimum_required(VERSION 3.5)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -18,12 +10,20 @@ set(CMAKE_CXX_STANDARD 17)
 
 option(MAXWELL_USE_MPI OFF)
 option(MAXWELL_ENABLE_PYTHON_BINDINGS OFF)
+option(MAXWELL_USE_MFEM_AS_SUBDIRECTORY ON)
 
 include_directories(
 	src/ 
 	src/maxwell/
 )
 
+if (MAXWELL_USE_MFEM_AS_SUBDIRECTORY)
+	add_subdirectory(external/mfem-geg)
+else ()
+	find_package(MFEM CONFIG REQUIRED)
+	include_directories(${MFEM_INCLUDE_DIRS})
+endif()
+
 add_subdirectory(src)
 
 if(MAXWELL_ENABLE_PYTHON_BINDINGS)
@@ -34,6 +34,3 @@ enable_testing()
 
 add_subdirectory(test/  )
 
-add_test(maxwell ${CMAKE_BINARY_DIR}/bin/maxwell_tests)
-add_test(mfem ${CMAKE_BINARY_DIR}/bin/mfem_tests)
-add_test(hesthavenComparison ${CMAKE_BINARY_DIR}/bin/hesthavenComparison_tests)

CMakePresets.json

@@ -0,0 +1,59 @@
+{
+    "version": 6,
+    "cmakeMinimumRequired": {
+      "major": 3,
+      "minor": 21,
+      "patch": 0
+    },
+    "configurePresets": [
+      {
+        "name": "gnu",
+        "displayName": "GNU release",
+        "binaryDir": "${sourceDir}/build/${presetName}",
+        "generator": "Ninja",
+        "cacheVariables": {
+          "CMAKE_TOOLCHAIN_FILE": {
+            "type": "FILEPATH",
+            "value": "$env{VCPKG_ROOT}/scripts/buildsystems/vcpkg.cmake"
+          },
+          "MAXWELL_USE_MFEM_AS_SUBDIRECTORY":{
+            "type": "BOOL",
+            "value": true
+          },
+          "CMAKE_BUILD_TYPE": {
+            "type": "STRING",
+            "value": "Release"
+          }
+        }
+      },
+      {
+        "name": "gnu-dbg",
+        "displayName": "GNU debug",
+        "inherits": "gnu",
+        "cacheVariables": {
+          "MFEM_DIR": {
+            "type": "FILEPATH",
+            "value": "$env{MFEM_DBG_DIR}"
+          },
+          "CMAKE_BUILD_TYPE": {
+            "type": "STRING",
+            "value": "Debug"
+          }
+        }
+      }
+    ],
+    "buildPresets": [
+      {
+        "name": "gnu",
+        "configurePreset": "gnu",
+        "displayName": "Build with GNU release",
+        "jobs": 0
+      },
+      {
+        "name": "gnu-dbg",
+        "configurePreset": "gnu-dbg",
+        "displayName": "Build with GNU debug",
+        "jobs": 0
+      }
+    ]
+  }

README.md

@@ -1,6 +1,8 @@
-# maxwell-dgtd
-Maxwell's curl equations solver using discontinuous Galerkin methods
+[![ubuntu-gnu](https://github.com/OpenSEMBA/dgtd/actions/workflows/ubuntu-gnu.yml/badge.svg)](https://github.com/OpenSEMBA/dgtd/actions/workflows/ubuntu-gnu.yml)
+[![windows-msvc](https://github.com/OpenSEMBA/dgtd/actions/workflows/windows-msvc.yml/badge.svg)](https://github.com/OpenSEMBA/dgtd/actions/workflows/windows-msvc.yml)
 
+# semba-dgtd
+Maxwell's curl equations solver using discontinuous Galerkin methods
 
 ## Compiling
 
@@ -133,6 +135,3 @@ Example of a sources section with all available types of sources defined for doc
 - A totalField source defined on interfaces or boundary faces 1, 2, 3 and 4, polarised on the direction Y for the "E" field and with a propagation vector in the direction X, the wave that will appear will be of type "gaussian" with the defined delay and spread.
 
 https://github.com/OpenSEMBA/dgtd/blob/5dd67ef6435066172e9387d674ea7ccc4c6a8b87/testData/maxwellInputs/1D_PEC_Centered/1D_PEC_Centered.json#L50-L83
-
-
-