Merge pull request #66 from OpenSEMBA/dev

Merging dev into main

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

@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - main
-      - feature/automatic-releases
 
 
 jobs:

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

@@ -11,7 +11,6 @@ on:
   push:
     branches:
       - main
-      - feature/automatic-releases
 
 jobs:
 
@@ -24,21 +23,18 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: cache install oneAPI
-      id: cache-install
-      uses: actions/cache@v2
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
       with:
-        path: |
-            C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
-            C:\Program Files (x86)\Intel\oneAPI\compiler
-        key: install-${{ env.CACHE_NUMBER }}-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_FORTRAN_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
-
-    - name: non-cache install oneAPI
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      shell: bash
-      timeout-minutes: 20
-      run: .github/workflows/install_windows.bat $WINDOWS_HPCKIT_URL
+        mpi: 'intelmpi'
 
+    - name: Setup intel fortran
+      uses: fortran-lang/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: intel
+        version: '2024.1'    
+
     - name: Setup ninja
       uses: seanmiddleditch/gha-setup-ninja@master
 
@@ -56,11 +52,6 @@ jobs:
       timeout-minutes: 120
       run: |
         .github/workflows/run_tests_windows.bat
-                 
-    - name: exclude unused files from cache
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      shell: bash
-      run: .github/workflows/oneapi_cache_exclude_windows.sh
     
     - name: Get current date
       id: date

.github/workflows/ubuntu-intelLLVM.yml

@@ -1,10 +1,5 @@
 name: ubuntu-intelLLVM
 
-env:
-  LINUX_CPP_COMPONENTS: intel-oneapi-compiler-dpcpp-cpp
-  LINUX_FORTRAN_COMPONENTS: intel-oneapi-compiler-fortran intel-oneapi-mpi-2021.3.0 intel-oneapi-mpi-devel-2021.3.0
-# https://github.com/oneapi-src/oneapi-ci/blob/master/.github/workflows/build_all.yml
-
 on:
   push:
     branches:
@@ -38,24 +33,17 @@ jobs:
           /opt/intel/oneapi
         key: install-apt
 
-    - name: non-cache install oneAPI
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      timeout-minutes: 10
-      run: |
-        sh -c .github/workflows/oneapi_setup_apt_repo_linux.sh
-        sudo apt install ${{ env.LINUX_CPP_COMPONENTS }} ${{ env.LINUX_FORTRAN_COMPONENTS }}
-
-    - name: Setup Intel oneAPI environment
-      run: |
-        LATEST_VERSION=$(ls -1 /opt/intel/oneapi/compiler/ | grep -v latest | sort | tail -1)
-        source /opt/intel/oneapi/compiler/"$LATEST_VERSION"/env/vars.sh
-        source /opt/intel/oneapi/mpi/2021.3.0/env/vars.sh
-        # source /opt/intel/oneapi/setvars.sh
-        printenv >> $GITHUB_ENV
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
+      with:
+        mpi: 'intelmpi'
 
-    - name: print config log
-      if: ${{ failure() }}
-      run: cat build/CMakeFiles/CMakeConfigureLog.yaml
+    - name: Setup intel fortran
+      uses: fortran-lang/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: intel
+        version: '2024.2'
 
     - name: CMake build
       run: |
@@ -77,8 +65,4 @@ jobs:
     - name: Run wrapper tests
       timeout-minutes: 60
       run: |
-        python -m pytest test    
-        
-    - name: exclude unused files from cache
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      run: sh -c .github/workflows/oneapi_cache_exclude_linux.sh
+        python -m pytest test    

.github/workflows/windows-intelLLVM.yml

@@ -1,12 +1,5 @@
 name: windows-intelLLVM
 
-env:
-  WINDOWS_BASEKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/62641e01-1e8d-4ace-91d6-ae03f7f8a71f/w_BaseKit_p_2024.0.0.49563_offline.exe
-  WINDOWS_HPCKIT_URL: https://registrationcenter-download.intel.com/akdlm/IRC_NAS/5b36181e-4974-4733-91c7-0c10c54900a5/w_HPCKit_p_2024.0.0.49588_offline.exe
-  WINDOWS_CPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
-  WINDOWS_FORTRAN_COMPONENTS: intel.oneapi.win.ifort-compiler
-  WINDOWS_DPCPP_COMPONENTS: intel.oneapi.win.cpp-dpcpp-common
-
 on:
   push:
     branches:
@@ -29,20 +22,17 @@ jobs:
       with:
         submodules: 'recursive'
 
-    - name: cache install oneAPI
-      id: cache-install
-      uses: actions/cache@v2
+    - name: Setup MPI
+      uses: mpi4py/setup-mpi@v1
       with:
-        path: |
-            C:\Program Files (x86)\Intel\oneAPI\setvars-vcvarsall.bat
-            C:\Program Files (x86)\Intel\oneAPI\compiler
-        key: install-${{ env.CACHE_NUMBER }}-${{ env.WINDOWS_HPCKIT_URL }}-${{ env.WINDOWS_FORTRAN_COMPONENTS }}-compiler-${{ hashFiles('**/scripts/cache_exclude_windows.sh') }}
+        mpi: 'intelmpi'
 
-    - name: non-cache install oneAPI
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      shell: bash
-      timeout-minutes: 20
-      run: .github/workflows/install_windows.bat $WINDOWS_HPCKIT_URL
+    - name: Setup intel fortran
+      uses: fortran-lang/setup-fortran@v1
+      id: setup-fortran
+      with:
+        compiler: intel
+        version: '2024.0'
 
     - name: Setup ninja
       uses: seanmiddleditch/gha-setup-ninja@master
@@ -60,10 +50,4 @@ jobs:
       shell: bash
       timeout-minutes: 120
       run: |
-        .github/workflows/run_tests_windows.bat
-         
-         
-    - name: exclude unused files from cache
-      if: steps.cache-install.outputs.cache-hit != 'true'
-      shell: bash
-      run: .github/workflows/oneapi_cache_exclude_windows.sh
+        .github/workflows/run_tests_windows.bat

CMakeLists.txt

@@ -1,7 +1,7 @@
-cmake_minimum_required (VERSION 3.10)
+cmake_minimum_required (VERSION 3.15)
 
-enable_language (CXX Fortran)
 project(semba-fdtd Fortran)
+enable_language (CXX C Fortran)
 
 set(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
@@ -32,10 +32,10 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
 	add_definitions(-DCompileWithIncludeMpifh)
 endif()
 if(CMAKE_Fortran_COMPILER_ID MATCHES "^Intel")
-	set(CMAKE_Fortran_FLAGS "-fpp -diag-disable=10441 -qopenmp")
-	set(CMAKE_CXX_FLAGS "-diag-disable=10448")
+	set(CMAKE_Fortran_FLAGS "-fpp")
 	if (CMAKE_SYSTEM_NAME MATCHES "Linux")
-		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopenmp -diag-disable=10448")
+		set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -qopenmp")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -qopenmp")
 	endif()
 	if(CMAKE_BUILD_TYPE MATCHES "Debug")
 		set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -check all,nouninit -debug full -traceback")
@@ -115,6 +115,7 @@ if (SEMBA_FDTD_MAIN_LIB)
 		"src_main_pub/resuming.F90"	
 		"src_main_pub/timestepping.F90"
 		"src_main_pub/observation.F90"
+		"src_main_pub/vtk.F90"
 		"src_wires_pub/wires.F90"
 		"src_wires_pub/wires_mtln.F90"
 	)