Merge pull request #225 from OpenSEMBA/dev

Merge Dev into Master

Author: adrianarce-elemwave

.gitignore

@@ -40,6 +40,7 @@ venv/
 build/
 build-*/
 
+CMakeUserPresets.json
 CMakeSettings.json
 /CppProperties.json
 

CMakeLists.txt

@@ -135,26 +135,14 @@ elseif(CMAKE_SYSTEM_NAME MATCHES "Windows")
 		# This prevents a compilation error happening due to visual studio headers being too strict.
 		# It can possibly can be removed in the future.
 		add_compile_definitions("$<$<COMPILE_LANGUAGE:C,CXX>:-D_ALLOW_COMPILER_AND_STL_VERSION_MISMATCH>")
-
+		add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:/nofpp>)
 		set(CMAKE_CXX_FLAGS "/Qopenmp")
-		set(CMAKE_Fortran_FLAGS "/Qopenmp /fpp")
+		set(CMAKE_Fortran_FLAGS "/Qopenmp")
 
 		# Not tested
-
-		# set(CMAKE_Fortran_FLAGS_RELEASE "/fast")
-		
-		set(CMAKE_CXX_FLAGS_FLAGS_DEBUG "/Qopenmp-simd- /Wno-debug-option-simd")
-		# set(CMAKE_Fortran_FLAGS_DEBUG "/check all,nouninit /debug full -traceback")
-
-	elseif((CMAKE_Fortran_COMPILER_ID MATCHES "Intel"))
-		message(STATUS "Using Intel (ifort) flags")
-		set(CMAKE_CXX_FLAGS "/Qopenmp")
-
-		# Not tested
-		# set(CMAKE_Fortran_FLAGS "/fpp /qopenmp") 
-
 		# set(CMAKE_Fortran_FLAGS_RELEASE "/fast")
 
+		#set(CMAKE_CXX_FLAGS_FLAGS_DEBUG "/Qopenmp-simd- /Wno-debug-option-simd")
 		# set(CMAKE_Fortran_FLAGS_DEBUG "/check all,nouninit /debug full -traceback")
 	else()
 		message(FATAL_ERROR "Unrecognized compiler id:" ${CMAKE_Fortran_COMPILER_ID})

CMakePresets.json

@@ -0,0 +1,29 @@
+{
+  "version": 3,
+  "configurePresets": [
+    {
+      "name": "rls",
+      "generator": "Ninja",
+      "binaryDir": "build-rls/",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release"
+      }
+    },
+    {
+      "name": "dbg",
+      "inherits": "rls",
+      "binaryDir": "build-dbg/",
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Debug"
+      }
+    },
+    {
+      "name": "dbg-nomtln",
+      "inherits": "dbg",
+      "binaryDir": "build-dbg-nomtln/",
+      "cacheVariables": {
+        "SEMBA_FDTD_ENABLE_MTLN": "No"
+      }
+    }
+  ]
+}

doc/development.md

@@ -138,38 +138,55 @@ Once the environment is loaded, follow the steps in the next section.
 
 1. **Install necessary tools**:
    - Install **Intel Base Kit** and **Intel HPC Kit**.
-   - Install Visual Studio 2019. This must be done **after** the intel Intel compilers. Visual Studio 2022 is not supported (as of Oct. 2024).
-   - Ensure **CMake** is installed. It's recommended to use **CMake GUI** to simplify configuration on Windows.
+   - Install Visual Studio 2022. This must be done **after** the intel Intel compilers.
+   - Ensure **CMake** is installed. 
 
-2. **Generate the Project with CMake GUI**:
-   - In **CMake GUI**, select the option to create a project for **Visual Studio 2019** from the CMake files.
-   - Set `-T fortran=ifx` to use intelLLVM compiler.
-   - Specify the output folder where the `.sln` file for the project will be generated.
+3. **Open a terminal with the Intel One API variables loaded**:
+   - Launch Visual Studio 2022 with
+     ```
+     "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\IDE\devenv.exe"  
+     ```
+   - Open the opensemba/fdtd cloned repo as a folder.
 
-3. **Open the Project in Visual Studio**:
-   - Open the generated `.sln` file in Visual Studio 2019.
-   - You will see multiple projects in the solution, one for each library and executable.
 
-4. **Compilation Configuration**:
-   - You may encounter specific errors in the **fdtd-tests** projects during compilation, particularly related to the `/Mtd` or `/MD` options.
-   - To resolve this issue:
-     - Right-click on the problematic project (`fdtd_tests`) and select **Properties**.
-     - Go to **Code Generation** and change the corresponding option to `/Mtd`.
-
-5. **Set the Main Project**:
-   - Select the `semba-fdtd` project and set it as the main project.
+4. **Ensure cmake has nofpp option**:
+   - The following command 
+     ```
+     add_compile_options($<$<COMPILE_LANGUAGE:Fortran>:/nofpp>)
+     ```
+     must be present in CMakeLists.txt due to an issue https://gitlab.kitware.com/cmake/cmake/-/issues/21816
 
 6. **Debugger Configuration**:
-   - In the project properties, go to the **Debugger** section.
+   - Select your current build as start up item
+   - In Debug options, open `Debug and launch settings` for your start up item
    - Configure the following parameters:
      - **Working Directory**: Set the working directory based on the case you want to debug.
      - **Command Arguments**: Enter `-i filename` (where `filename` is the required input file).
+     You should end up with something like this.
+     ```
+      {
+        "configurations": [
+                {
+                    "type": "default",
+                    "project": "CMakeLists.txt",
+                    "projectTarget": "semba-fdtd.exe (bin\\semba-fdtd.exe)",
+                    "name": "semba-fdtd.exe (bin\\semba-fdtd.exe)",
+                    "currentDir": "<root-folder>\\tmp_cases\\coated_antenna",
+                    "args": [
+                        "-i",
+                        "coated_antenna.fdtd.json",
+                        "-mtlnwires"
+                        ]
+                }
+        ],
+        "defaults": {},
+        "version": "0.2.1"
+      }
+     ```
 
 7. **Debug the Project**:
    - Launch the project by pressing **F5** to begin debugging.
 
-Following these steps, the project should be set up and ready to compile and debug in Visual Studio 2019 with Intel tools.
-
 ## WSL2 + Visual Studio Code + GFortran Setup Guide
 
 ### Prerequisites

src_json_parser/parser_tools.F90

@@ -1,5 +1,5 @@
 module parser_tools_mod
-    
+
 #ifdef CompileWithSMBJSON
    use mesh_mod
    use cells_mod
@@ -23,10 +23,6 @@ module parser_tools_mod
       integer :: cId
       type(coordinate_t) :: relPos
    end type
-
-   ! type :: cable_ptr_t
-   !    type(cable_t), pointer :: p
-   ! end type
 #endif
 
 contains
@@ -42,11 +38,11 @@ function getIntervalsInCellRegions(cellRegions, cellType) result (intervals)
       do i = 1, size(cellRegions)
          if (present(cellType)) then
             numberOfIntervals = numberOfIntervals + count(cellRegions(i)%intervals%getType() == cellType)
-         else 
+         else
             numberOfIntervals = numberOfIntervals + size(cellRegions(i)%intervals)
          end if
       end do
-      
+
       allocate(intervals(numberOfIntervals))
       copiedIntervals = 0
       do i = 1, size(cellRegions)
@@ -57,12 +53,12 @@ function getIntervalsInCellRegions(cellRegions, cellType) result (intervals)
          end if
          do j = 1, size(intervalsInRegion)
             copiedIntervals = copiedIntervals + 1
-            intervals(copiedIntervals) = intervalsInRegion(j) 
+            intervals(copiedIntervals) = intervalsInRegion(j)
          end do
       end do
 
    end function
-   
+
    function cellRegionToCoords(cellRegion, cellType, tag) result(res)
       type(cell_region_t), intent(in) :: cellRegion
       integer, intent(in), optional :: cellType
@@ -75,7 +71,7 @@ function cellRegionToCoords(cellRegion, cellType, tag) result(res)
       intervals = getIntervalsInCellRegions([cellRegion], cellType)
       if (present(tag)) then
          cs = cellIntervalsToCoords(intervals, tag)
-      else 
+      else
          cs = cellIntervalsToCoords(intervals)
       endif
       res = cs
@@ -115,7 +111,7 @@ function coordsToScaledCoords(cs) result(res)
             res(i)%zc = -1.0
          end select
       end do
-   end 
+   end
 
    subroutine cellRegionsToScaledCoords(res, cellRegions, tag)
       type(coords_scaled), dimension(:), pointer :: res
@@ -124,7 +120,7 @@ subroutine cellRegionsToScaledCoords(res, cellRegions, tag)
       type(coords), dimension(:), allocatable :: cs
       type(coords_scaled), dimension(:), allocatable :: scaledCoords
       character (LEN=BUFSIZE), optional, intent(in) :: tag
-      
+
       intervals = getIntervalsInCellRegions(cellRegions, CELL_TYPE_LINEL)
       if (present(tag)) then
          cs = cellIntervalsToCoords(intervals, tag)
@@ -160,7 +156,7 @@ subroutine convertInterval(xi, xe, interval, dir)
          type(cell_interval_t), intent(in) :: interval
          integer, intent(in) :: dir
          integer :: a, b
-         a = interval%ini%cell(dir) 
+         a = interval%ini%cell(dir)
          b = interval%end%cell(dir)
          if (a < b) then
             xi = a

src_main_pub/anisotropic.F90

@@ -73,7 +73,7 @@ subroutine InitAnisotropic(sgg,media,ThereAreAnisotropic,ThereAreThinSlot,eps00,
       logical, INTENT(OUT)  ::  ThereAreAnisotropic,ThereAreThinSlot
       integer (kind=4)  ::  jmed,j1,conta,k1,i1,tempindex
 
-      eps0=eps00; mu0=mu00; !chapuz para convertir la variables de paso en globales
+      eps0=eps00; mu0=mu00;
 
       !!!
 
@@ -318,10 +318,8 @@ subroutine InitAnisotropic(sgg,media,ThereAreAnisotropic,ThereAreThinSlot,eps00,
                (sgg%Eshared%elem(j1)%Field == iEx)) then
                   AniMed%info(jmed)%Ex_Shared(i1)%times = sgg%Eshared%elem(j1)%Times
                   if (sgg%Eshared%elem(j1)%Times > 1 ) then
-                     allocate (AniMed%info(jmed)%Ex_Shared(i1)%SharedMed(1:sgg%Eshared%elem(j1)%Times)) !OJO, EN EL ORIGINAL LO ALLOCATEABA HASTA -1
-                     !LO CAMBIO EL 26/10 POR ERROR EN LA NACELLE DEL SS5, PERO NO ESTOY SEGURO QUE HAYA UN BUG CON ESTO DE LOS SHARED !!?
+                     allocate (AniMed%info(jmed)%Ex_Shared(i1)%SharedMed(1:sgg%Eshared%elem(j1)%Times))    
                   endif
-                  !PRINT *,'---> eX',sgg%Eshared%elem(j1)%i,sgg%Eshared%elem(j1)%J,sgg%Eshared%elem(j1)%k,sgg%Eshared%elem(j1)%times
                   exit buscaEx
                endif
             end do
@@ -337,7 +335,6 @@ subroutine InitAnisotropic(sgg,media,ThereAreAnisotropic,ThereAreThinSlot,eps00,
                   if (sgg%Eshared%elem(j1)%Times > 1 ) then
                      allocate (AniMed%info(jmed)%Ey_Shared(i1)%SharedMed(1:sgg%Eshared%elem(j1)%Times))
                   endif
-                  !PRINT *,'---> ey',sgg%Eshared%elem(j1)%i,sgg%Eshared%elem(j1)%J,sgg%Eshared%elem(j1)%k,sgg%Eshared%elem(j1)%times
                   exit buscaEy
                endif
             end do
@@ -412,9 +409,7 @@ subroutine InitAnisotropic(sgg,media,ThereAreAnisotropic,ThereAreThinSlot,eps00,
       end do
 
       !STORE THE INDEXES OF THE SHARED MEDIA
-
-
-      do jmed=1,AniMed%NumMed !barrelos ahora todos
+      do jmed=1,AniMed%NumMed 
          do i1=1,AniMed%info(jmed)%NumNodesEx
             conta=0
             do j1=1,sgg%Eshared%conta

src_main_pub/electricdispersive.F90

@@ -1,12 +1,12 @@
 
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! Module EDispersives !ojo los polos conjugados DEBEN APARECER explicitamente 20JUNE'12
+! Module EDispersives !ojo los polos conjugados DEBEN APARECER explicitamente
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 ! Beware in Dutton's model BOTH pair OF complex conjugate poles/residues
 ! in input from .nfde MUST APPEAR (this is why the factor /2 in the algorithm part
 ! for instance a 1 real-pole and 2 ccomplex-pole material would require in nfde
-! 5 poles (not 3) !UNTESTED SGG JUN'12
+! 5 poles (not 3) 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 module EDispersives

src_main_pub/fdetypes.F90

@@ -656,7 +656,7 @@ module  FDETYPES
                  groundwires,noSlantedcrecepelo, & 
                  mibc,ADE,conformalskin,sgbc, sgbcDispersive, sgbccrank, & 
                  NOcompomur,strictOLD,TAPARRABOS, & 
-                 noconformalmapvtk, hopf,experimentalVideal, &
+                 noconformalmapvtk, experimentalVideal, &
                  forceresampled, mur_second,MurAfterPML, &
                  stableradholland,singlefilewrite,NF2FFDecim, &
                  fieldtotl,finishedwithsuccess, &
@@ -672,7 +672,7 @@ module  FDETYPES
       real (kind=rkind_wires) :: factorradius,factordelta
 
       character (len=BUFSIZE) :: nEntradaRoot, inductance_model,wiresflavor, nresumeable2
-      CHARACTER (LEN=BUFSIZE) :: opcionestotales, ficherohopf
+      CHARACTER (LEN=BUFSIZE) :: opcionestotales
 
       integer (kind=4) :: finaltimestep, flushsecondsFields,flushsecondsData, layoutnumber,& 
                           mpidir, inductance_order, wirethickness, maxCPUtime, SGBCDepth, precision, size

src_main_pub/getargs.F90

@@ -1,9 +1,9 @@
 
-    
+
 Module Getargs
    USE NFDETYPES , ONLY: BUFSIZE
    implicit none
-   private 
+   private
 
    public getBinaryPath, getcommandargument,commandargumentcount
 
@@ -23,18 +23,18 @@ subroutine getcommandargument(chain2,posic,argum,length,status, binaryPath)
 
       ! CALL getarg(0, binaryPath)
       binaryPathLenght = len(trim(adjustl(binaryPath)))
-      
+
       !!Check if binary path is surrounded by double quotes. In that case, returns corrected binary path and lenght
       if ((chain2(1:1) == '"') .and. (chain2(binaryPathLenght+2 : binaryPathLenght+2) == '"')) then
-        binaryPath = '"' // trim(adjustl(binaryPath)) // '"'
-        binaryPathLenght = binaryPathLenght + 2
+         binaryPath = '"' // trim(adjustl(binaryPath)) // '"'
+         binaryPathLenght = binaryPathLenght + 2
       end if
 
-      if (posic == 1) then 
+      if (posic == 1) then
          argum = binaryPath
          return
       end if
-      
+
       status=0
       argumentStart=0
       argumentEnd=0
@@ -59,7 +59,7 @@ subroutine getcommandargument(chain2,posic,argum,length,status, binaryPath)
       if (argumentStart+argumentEnd==0) status=1
       argum=trim(adjustl(chain2(argumentStart : argumentEnd)))
 
-      !100615 para evitar el crlf del .sh
+      !Avoids crlf in .sh
       if ( (argum(1:1) ==char(10)) .or. (argum(1:1) ==char(13)) .or. (argum(1:1)==char( 0)) ) then
          argum=''
          return
@@ -82,8 +82,8 @@ subroutine removeDoubleWhiteSpaces(chain2)
             end do rebus
          endif
       end do
-   
-      end subroutine
+
+   end subroutine
 
    function commandargumentcount(chain2, binaryPath)
       character (LEN=BUFSIZE)  ::  chain2, binaryPath
@@ -93,19 +93,19 @@ function commandargumentcount(chain2, binaryPath)
 
       ! CALL getarg(0, binaryPath)
       binaryPathLenght = len(trim(adjustl(binaryPath)))
-      
+
       !!Check if binary path is surrounded by double quotes. In that case, returns corrected binary path and lenght
       if ((chain2(1:1) == '"') .and. (chain2(binaryPathLenght+2 : binaryPathLenght+2) == '"')) then
-        binaryPath = '"' // trim(adjustl(binaryPath)) // '"'
-        binaryPathLenght = binaryPathLenght + 2
+         binaryPath = '"' // trim(adjustl(binaryPath)) // '"'
+         binaryPathLenght = binaryPathLenght + 2
       end if
 
       n = 1
 
       do i=binaryPathLenght  ,len(trim(adjustl(chain2)))
          if (chain2(i : i)==' ') then
             n=n+1
-         endif 
+         endif
       end do
 
       status=0