236 investigate and separate current dependencies between observations module and the rest of the solver

.github/workflows/ubuntu.yml

@@ -29,6 +29,7 @@ jobs:
         mtln: ["ON", "OFF"]
         hdf: ["ON"]
         double-precision: ["OFF"]
+        new-output-module: ["OFF","ON"]
 
         include:
           # Disable by lack of space on github action
@@ -89,13 +90,15 @@ jobs:
           -DSEMBA_FDTD_ENABLE_MPI=${{matrix.mpi}} \
           -DSEMBA_FDTD_ENABLE_HDF=${{matrix.hdf}} \
           -DSEMBA_FDTD_ENABLE_MTLN=${{matrix.mtln}} \
-          -DSEMBA_FDTD_ENABLE_DOUBLE_PRECISION=${{matrix.double-precision}}
+          -DSEMBA_FDTD_ENABLE_DOUBLE_PRECISION=${{matrix.double-precision}} \
+          -DSEMBA_FDTD_ENABLE_OUTPUT_MODULE=${{matrix.new-output-module}}
         cmake --build build -j
 
     - name: Run unit tests 
       run: build/bin/fdtd_tests
 
     - name: Run python tests
+      if: matrix.new-output-module=='OFF'
       env:
         SEMBA_FDTD_ENABLE_MPI: ${{ matrix.mpi }}
         SEMBA_FDTD_ENABLE_MTLN: ${{ matrix.mtln }}

.gitmodules

@@ -20,4 +20,4 @@
 
 [submodule "external/googletest"]
 	path = external/googletest
-	url = https://github.com/OpenSEMBA/googletest.git
+	url = https://github.com/OpenSEMBA/googletest.git

CMakeLists.txt

@@ -16,7 +16,7 @@ option(SEMBA_FDTD_ENABLE_MPI "Use MPI" OFF)
 option(SEMBA_FDTD_ENABLE_HDF "Use HDF" ON)
 option(SEMBA_FDTD_ENABLE_MTLN "Use MTLN" ON)
 option(SEMBA_FDTD_ENABLE_SMBJSON "Use smbjson" ON)
-option(SEMBA_FDTD_ENABLE_DOUBLE_PRECISION "Use double precision (CompileWithReal8)" OFF)
+option(SEMBA_FDTD_ENABLE_DOUBLE_PRECISION "Use double precision (CompileWithReal8)" ON)
 
 option(SEMBA_FDTD_ENABLE_TEST "Compile tests" ON)
 
@@ -27,12 +27,26 @@ 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)
+
+option(SEMBA_FDTD_ENABLE_OUTPUT_MODULE "Use new output module" OFF)
+
 # Compilation defines.
 if(CMAKE_BUILD_TYPE MATCHES "Release" OR CMAKE_BUILD_TYPE MATCHES "release" )
 	add_definitions(-DCompileWithRelease)
 else()
 	add_definitions(-DCompileWithDebug)
 endif()
+if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
+add_compile_definitions(__WIN32__)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
+add_compile_definitions(__APPLE__)
+elseif (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+add_compile_definitions(__linux__)
+endif()
+
+if(SEMBA_FDTD_ENABLE_OUTPUT_MODULE)
+	add_definitions(-DCompileWithNewOutputModule)
+endif()
 if(SEMBA_FDTD_ENABLE_SMBJSON)
 	add_definitions(-DCompileWithSMBJSON)
 endif()
@@ -49,6 +63,14 @@ add_definitions(
 	-DCompileWithOpenMP
 )
 
+if(CMAKE_Fortran_COMPILER_ID MATCHES "GNU")
+	add_definitions(-DGNUCompiler)
+endif()
+if(CMAKE_Fortran_COMPILER_ID MATCHES "IntelLLVM")
+	add_definitions(-DIFXCompiler)
+endif()
+
+
 include("${CMAKE_CURRENT_SOURCE_DIR}/set_precompiled_libraries.cmake")
 
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -174,6 +196,22 @@ if (SEMBA_FDTD_ENABLE_MTLN)
 	endif()
 endif()
 
+add_subdirectory(src_utils)
+
+if (SEMBA_FDTD_ENABLE_OUTPUT_MODULE)
+	add_subdirectory(src_output)
+	set(OUTPUT_LIBRARIES fdtd-output)
+	target_link_libraries(fdtd-output
+	semba-components
+	semba-types
+	fdtd-utils
+	${HDF5_LIBRARIES} ${HDF5_HL_LIBRARIES}
+	)
+
+	target_include_directories(fdtd-output PRIVATE ${HDF5_INCLUDE_DIRS})
+	set(VTK_API_LIBRARIES vtkAPI)
+	set(XDMF_API_LIBRARIES xdmfAPI)
+endif()
 add_subdirectory(src_conformal)
 set(CONFORMAL_LIBRARIES conformal)
 
@@ -182,6 +220,8 @@ if (SEMBA_FDTD_ENABLE_TEST)
 	add_subdirectory(test)
 endif()
 
+
+
 if(SEMBA_FDTD_COMPONENTS_LIB)
 	add_library(semba-components
 		"src_main_pub/anisotropic.F90"
@@ -244,7 +284,11 @@ if(SEMBA_FDTD_MAIN_LIB)
 		"src_main_pub/timestepping.F90"
 	)
 	target_link_libraries(semba-main
-		semba-outputs 
+		semba-outputs
+		fdtd-utils
+		${OUTPUT_LIBRARIES}
+		${VTK_API_LIBRARIES}
+		${XDMF_API_LIBRARIES}
 		${SMBJSON_LIBRARIES} 
 		${MTLN_LIBRARIES})
 endif()

CMakePresets.json

@@ -24,6 +24,31 @@
       "cacheVariables": {
         "SEMBA_FDTD_ENABLE_MTLN": "OFF"
       }
+    },
+    {
+      "name": "intel-rls",
+      "generator": "Ninja",
+      "binaryDir": "build-intel-rls/",
+      "environment": {
+        "I_MPI_ROOT": "/opt/intel/oneapi/mpi/latest",
+        "FC": "mpiifx",
+        "CC": "mpiicx",
+        "CXX": "mpiicpx"
+      },
+      "cacheVariables": {
+        "CMAKE_BUILD_TYPE": "Release",
+        "SEMBA_FDTD_ENABLE_MPI": "ON",
+        "SEMBA_FDTD_ENABLE_MTLN": "ON",
+        "SEMBA_FDTD_ENABLE_DOUBLE_PRECISION": "ON"
+      }
+    },
+    {
+      "name": "intel-rls-nomtln",
+      "inherits": "intel-rls",
+      "binaryDir": "build-intel-rls-nomtln/",
+      "cacheVariables": {
+        "SEMBA_FDTD_ENABLE_MTLN": "OFF"
+      }
     }
   ]
 }

setup_intel_build.sh

@@ -0,0 +1,53 @@
+#!/bin/bash
+# ========================================================
+# Script para limpiar CMake y configurar Intel 2025.3
+# ========================================================
+
+# --------------------------
+# Configuración del proyecto
+# --------------------------
+SRC_DIR="/home/username/elemwave/fdtd"
+BUILD_DIR="$SRC_DIR/build-dbg"
+
+# --------------------------
+# Carga Intel oneAPI 2025.3
+# --------------------------
+echo "Cargando Intel oneAPI 2025.1..."
+source /opt/intel/oneapi/setvars.sh intel64 --force --compiler-version=2025.1
+
+# --------------------------
+# Definir compiladores Intel
+# --------------------------
+export CC=/opt/intel/oneapi/compiler/2025.1/bin/icx
+export CXX=/opt/intel/oneapi/compiler/2025.1/bin/icpx
+export FC=/opt/intel/oneapi/compiler/2025.1/bin/ifx
+
+echo "Compiladores configurados:"
+echo "  CC = $CC"
+echo "  CXX = $CXX"
+echo "  FC = $FC"
+
+# --------------------------
+# Limpiar build anterior
+# --------------------------
+if [ -d "$BUILD_DIR" ]; then
+    echo "Eliminando cache de CMake y archivos previos..."
+    rm -rf "$BUILD_DIR/CMakeCache.txt" "$BUILD_DIR/CMakeFiles"
+else
+    mkdir -p "$BUILD_DIR"
+fi
+
+# --------------------------
+# Ejecutar CMake con Ninja
+# --------------------------
+echo "Ejecutando CMake con Intel..."
+cmake -G Ninja \
+      -DCMAKE_BUILD_TYPE=Debug \
+      -DCMAKE_C_COMPILER=$CC \
+      -DCMAKE_CXX_COMPILER=$CXX \
+      -DCMAKE_Fortran_COMPILER=$FC \
+      -S "$SRC_DIR" \
+      -B "$BUILD_DIR"
+
+echo "¡Configuración completa! Ahora puedes compilar con:"
+echo "  ninja -C $BUILD_DIR"

src_main_pub/fdetypes.F90

@@ -6,7 +6,6 @@
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 module  FDETYPES
 
-
 #ifdef CompileWithOpenMP
    use omp_lib
 #endif
@@ -186,6 +185,17 @@ module  FDETYPES
    integer (kind=4),  parameter  ::  iBloqueJx=100*iEx,iBloqueJy=100*iEy,iBloqueJz=100*iEz
    integer (kind=4),  parameter  ::  iBloqueMx=100*iHx,iBloqueMy=100*iHy,iBloqueMz=100*iHz
    !
+   integer (kind=4),  parameter :: VOLUMIC_M_MEASURE(3) = [iCur, iMEC, iMHC] !Module
+   integer (kind=4),  parameter :: VOLUMIC_X_MEASURE(3) = [iCurx, iExC, iHxC]
+   integer (kind=4),  parameter :: VOLUMIC_Y_MEASURE(3) = [iCury, iEyC, iHyC]
+   integer (kind=4),  parameter :: VOLUMIC_Z_MEASURE(3) = [iCurz, iEzC, iHzC]
+
+   integer (kind=4),  parameter :: MAGNETIC_FIELD_DIRECTION(3) = [iEx, iEy, iEz]
+   integer (kind=4),  parameter :: ELECTRIC_FIELD_DIRECTION(3) = [iHx, iHy, iHz]
+   integer (kind=4),  parameter :: CURRENT_MEASURE(4) = [iCur, iCurx, iCury, iCurz]
+   integer (kind=4),  parameter :: ELECTRIC_FIELD_MEASURE(4) = [iMEC, iExC, iEyC, iEzC]
+   integer (kind=4),  parameter :: MAGNETIC_FIELD_MEASURE(4) = [iMHC, iHxC, iHyC, iHzC]
+   !
    CHARACTER (LEN=*), PARAMETER  ::  SEPARADOR='______________'
    integer (kind=4), PARAMETER  ::  comi=1,fine=2, icoord=1,jcoord=2,kcoord=3
 
@@ -591,6 +601,7 @@ module  FDETYPES
 
 
    type  ::  MediaData_t
+      integer(kind=SINGLE) :: Id
       REAL (KIND=RKIND)          ::  Priority,Epr,Sigma,Mur,SigmaM
       logical :: sigmareasignado !solo afecta a un chequeo de errores en lumped 120123
       type (exists_t)            ::  Is
@@ -616,15 +627,15 @@ module  FDETYPES
       REAL (KIND=RKIND_tiempo)  ::  dt
       character (len=BUFSIZE) :: extraswitches
       !!
-      integer (kind=4)   ::  NumMedia,AllocMed
-      integer (kind=4)   ::  IniPMLMedia,EndPMLMedia
-      integer (kind=4)   ::  NumPlaneWaves,TimeSteps,InitialTimeStep
-      integer (kind=4)   ::  NumNodalSources
-      integer (kind=4)   ::  NumberRequest
+      integer (kind=SINGLE)   ::  NumMedia,AllocMed
+      integer (kind=SINGLE)   ::  IniPMLMedia,EndPMLMedia
+      integer (kind=SINGLE)   ::  NumPlaneWaves,TimeSteps,InitialTimeStep
+      integer (kind=SINGLE)   ::  NumNodalSources
+      integer (kind=SINGLE)   ::  NumberRequest = 0_SINGLE
       !!!
       REAL (KIND=RKIND)     , pointer, dimension ( : )        ::  LineX,LineY,LineZ
       REAL (KIND=RKIND)     , pointer, dimension ( : )        ::  DX,DY,DZ
-      integer (kind=4)                                        ::  AllocDxI,AllocDyI,AllocDzI,AllocDxE,AllocDyE,AllocDzE
+      integer (kind=SINGLE)                                        ::  AllocDxI,AllocDyI,AllocDzI,AllocDxE,AllocDyE,AllocDzE
       type (planeonde_t), pointer, dimension ( : )            ::  PlaneWave
       type (Border_t)                                         ::  Border
       type (PML_t)                                            ::  PML
@@ -641,6 +652,7 @@ module  FDETYPES
       logical  :: thereArePMLMagneticMedia
       CHARACTER (LEN=BUFSIZE) :: nEntradaRoot
       type (coorsxyzP)  ::  Punto
+
    end type
 
    type media_matrices_t
@@ -868,6 +880,8 @@ logical function direction_eq(a,b)
       direction_eq = direction_eq .and. (a%orientation == b%orientation)
 
    end function
+
+
 end module FDETYPES
 
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!

src_main_pub/observation.F90

@@ -743,13 +743,15 @@ subroutine InitObservation(sgg, media, tag_numbers, &
         type(mtln_solver_t), pointer :: mtln_solver
         integer :: i, j
         mtln_solver => GetSolverPtr()
-        do i = 1, ubound(mtln_solver%bundles, 1)
-          if (ubound(mtln_solver%bundles(i)%probes, 1) /= 0) then
-            do j = 1, ubound(mtln_solver%bundles(i)%probes, 1)
-              if (mtln_solver%bundles(i)%probes(j)%in_layer) ThereAreObservation = .true.
-            end do
-          end if
-        end do
+        if (mtln_solver%number_of_bundles > 0) then
+          do i = 1, ubound(mtln_solver%bundles, 1)
+            if (ubound(mtln_solver%bundles(i)%probes, 1) /= 0) then
+              do j = 1, ubound(mtln_solver%bundles(i)%probes, 1)
+                if (mtln_solver%bundles(i)%probes(j)%in_layer) ThereAreObservation = .true.
+              end do
+            end if
+          end do
+        end if
       end block
 #endif
       !
@@ -1796,13 +1798,13 @@ subroutine InitObservation(sgg, media, tag_numbers, &
                   if ((SGG%Observation(ii)%TimeDomain) .and. (sgg%observation(ii)%P(1)%what /= mapvtk)) then
                     !
                     read (output(ii)%item(i)%unit) ndum
-              if (output(ii)%item(i)%columnas /= ndum) call stoponerror(layoutnumber, size, 'BUGGYError reading resuming files () ')
+                    if (output(ii)%item(i)%columnas /= ndum) call stoponerror(layoutnumber, size, 'BUGGYError reading resuming files () ')
                     do conta = 1, output(ii)%item(i)%columnas
                       read (output(ii)%item(i)%unit) ndum, ndum, ndum, ndum, ndum
                     end do
                     cutting3: do
                       read (output(ii)%item(i)%unit, end=699) at
-          if (output(ii)%item(i)%columnas /= 0) read (output(ii)%item(i)%unit, end=699) (rdum, conta=1, output(ii)%item(i)%columnas)
+                      if (output(ii)%item(i)%columnas /= 0) read (output(ii)%item(i)%unit, end=699) (rdum, conta=1, output(ii)%item(i)%columnas)
                       output(ii)%TimesWritten = output(ii)%TimesWritten + 1
                       if (at > lastexecutedtime) then
                      print '(i4,a,a,2e19.9e3)', quienmpi, 'Cutting 3 ', trim(adjustl(output(ii)%item(i)%path)), at, lastexecutedtime