From 99c65e12f7c0217e2f62de04959ea5082461ed3d Mon Sep 17 00:00:00 2001 From: salva Date: Thu, 18 Apr 2024 22:36:13 +0200 Subject: [PATCH] faltaba otro ifdef mas para compilar con cygwin --- src_main_pub/semba_fdtd.F90 | 15 +++++++++++---- src_main_pub/timestepping.F90 | 2 +- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/src_main_pub/semba_fdtd.F90 b/src_main_pub/semba_fdtd.F90 index c6bef3ee..405341c5 100755 --- a/src_main_pub/semba_fdtd.F90 +++ b/src_main_pub/semba_fdtd.F90 @@ -81,7 +81,9 @@ PROGRAM SEMBA_FDTD_launcher !************************************************* ! !!! - use mtln_solver_mod, mtln_solver_t => mtln_t +#ifdef CompileWithWires_mtln + use mtln_solver_mod, mtln_solver_t => mtln_t +#endif !!! use interpreta_switches_m IMPLICIT NONE @@ -864,8 +866,11 @@ PROGRAM SEMBA_FDTD_launcher l%opcionestotales,l%sgbcfreq,l%sgbcresol,l%sgbccrank,l%sgbcdepth,l%fatalerror,l%fieldtotl,l%permitscaling, & l%EpsMuTimeScale_input_parameters, & l%stochastic,l%mpidir,l%verbose,l%precision,l%hopf,l%ficherohopf,l%niapapostprocess,l%planewavecorr, & - l%dontwritevtk,l%experimentalVideal,l%forceresampled,l%factorradius,l%factordelta,l%noconformalmapvtk, & - mtln_solver) + l%dontwritevtk,l%experimentalVideal,l%forceresampled,l%factorradius,l%factordelta,l%noconformalmapvtk & + ,mtln_solver & +#ifdef CompileWithWires_mtln + ) +#endif deallocate (sggMiEx, sggMiEy, sggMiEz,sggMiHx, sggMiHy, sggMiHz,sggMiNo,sggMtag) else @@ -1314,7 +1319,9 @@ subroutine NFDE2sgg l%groundwires,l%attfactorc,l%mibc,l%sgbc,l%sgbcDispersive,l%MEDIOEXTRA,maxSourceValue,l%skindepthpre,l%createmapvtk,l%input_conformal_flag,l%CLIPREGION,l%boundwireradius,l%maxwireradius,l%updateshared,l%run_with_dmma, & eps0,mu0,.false.,l%hay_slanted_wires,l%verbose,l%ignoresamplingerrors,tagtype,l%wiresflavor) !!!!mtln constructor 100424 !!!solo si es json, si no no existe parser!! - if (trim(adjustl(l%extension))=='.json') mtln_solver = mtlnCtor(parser%mtln) +#ifdef CompileWithWires_mtln + if (trim(adjustl(l%extension))=='.json') mtln_solver = mtlnCtor(parser%mtln) +#endif !!!! WRITE (dubuf,*) '[OK] ENDED NFDE --------> GEOM' CALL print11 (l%layoutnumber, dubuf) diff --git a/src_main_pub/timestepping.F90 b/src_main_pub/timestepping.F90 index 48d62a27..f3d7e24a 100755 --- a/src_main_pub/timestepping.F90 +++ b/src_main_pub/timestepping.F90 @@ -154,7 +154,7 @@ subroutine launch_simulation(sgg,sggMtag,sggMiNo,sggMiEx,sggMiEy,sggMiEz,sggMiHx #ifdef CompileWithWires_mtln type (mtln_solver_t) :: mtln_solver -#ifdef CompileWithWires_mtln +#endif !!! logical :: noconformalmapvtk logical :: hopf,experimentalVideal,forceresampled