Skip to content

[WIP] Remove conformal support from multiple modules and related code sections #346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
lmdiazangulo wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

[WIP] Remove conformal support from multiple modules and related code sections #346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions src_main_pub/fdetypes.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,9 +694,6 @@ module FDETYPES_m
permitscaling,mtlnberenger,niapapostprocess, &
stochastic, verbose, dontwritevtk, &
resume_fromold, vtkindex,createh5bin,wirecrank,fatalerror
#ifdef CompileWithConformal
logical :: input_conformal_flag
#endif
real(kind=8) :: time_desdelanzamiento
real(kind=RKIND) :: cfl, attfactorc,attfactorw, alphamaxpar, &
alphaOrden, kappamaxpar, mindistwires,sgbcFreq,sgbcresol, maxSourceValue
Expand Down
134 changes: 1 addition & 133 deletions src_main_pub/interpreta_switches.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,6 @@ module interpreta_switches_m
existeh5, &
fatalerror, &
fatalerrornfde2sgg, &
existeconf, &
existecmsh, &
thereare_stoch, &
experimentalVideal, &
simu_devia, &
Expand Down Expand Up @@ -394,53 +392,6 @@ subroutine interpreta(l, statuse)
l%run_with_dmma = .TRUE.
l%run_with_abrezanjas = .FALSE.
l%opcionespararesumeo = trim(adjustl(l%opcionespararesumeo))//' '//trim(adjustl(l%chain))

#ifdef CompileWithConformal
CASE ('-abrezanjas') !Provisional FEB-2018

!NOTE: Comento lo de abajo para debugear
! print *,'Abrezanjas not available (290521). '
! stop

l%run_with_dmma = .FALSE.
l%run_with_abrezanjas = .true.
if (.NOT. l%input_conformal_flag) then
l%conformal_file_input_name = char(0)
l%input_conformal_flag = .true.
end if
l%opcionespararesumeo = trim(adjustl(l%opcionespararesumeo))//' '//trim(adjustl(l%chain))

CASE ('-activateconf') !Provisional FEB-2018
if (.NOT. l%input_conformal_flag) then
l%conformal_file_input_name = char(0)
l%input_conformal_flag = .true.
end if
i = i + 1;
l%opcionespararesumeo = trim(adjustl(l%opcionespararesumeo))//' '//trim(adjustl(l%chain))
#endif
CASE ('-conf')
l%flag_conf_sgg = .true.
i = i + 1;
#ifdef CompileWithConformal
l%input_conformal_flag = .true.;
l%conformal_file_input_name = char(0);
call getcommandargument(l%chaininput, i, f, l%length, statuse, binaryPath)
l%conformal_file_input_name = trim(adjustl(f));
inquire(file=trim(adjustl(f)), EXIST=l%existeNFDE)
if (.NOT. l%existeNFDE) then
l%input_conformal_flag = .FALSE.;
buff = 'The conformal input file was not found '//trim(adjustl(l%fichin));
call WarnErrReport(Trim(buff), .true.)
end if
l%opcionespararesumeo = trim(adjustl(l%opcionespararesumeo))//' '//trim(adjustl(l%chain))
#endif
#ifndef CompileWithConformal
if (l%input_conformal_flag) then
buff = ''; buff = 'Conformal without conformal support. Recompile!';
call WarnErrReport(Trim(buff), .true.)
end if
#endif

CASE ('-takeintcripte')
l%takeintcripte = .true.
l%opcionespararesumeo = trim(adjustl(l%opcionespararesumeo))//' '//trim(adjustl(l%chain))
Expand Down Expand Up @@ -1365,9 +1316,6 @@ subroutine print_credits(l)
#ifdef CompileWithHDF
call print11(l%layoutnumber, 'Compiled WITH .h5 HDF support')
#endif
#ifdef CompileWithConformal
call print11(l%layoutnumber, 'Compiled WITH Conformal support')
#endif
#ifdef CompileWithMTLN
call print11(l%layoutnumber, 'Compiled WITH MTLN support')
#endif
Expand Down Expand Up @@ -1422,14 +1370,6 @@ subroutine print_help(l)
!! call print11 (l%layoutnumber, '& increase if requested at runtime ')
!!#endif

!*********************************************************************************************************************
!***[conformal] **************************************************************************************
!*********************************************************************************************************************
!conformal -help printf line ref: ##Confhelp##
#ifdef CompileWithConformal
call print11(l%layoutnumber, '-conf : Adds the conformal file to the simulation.')
#endif
!*********************************************************************************************************************
#ifdef CompileWithNIBC
call print11(l%layoutnumber, '-skindepthpre : Pre-processor for sgbc metals including skin depth.')
call print11(l%layoutnumber, '-mibc : Uses pure l%mibc to deal with composites. ')
Expand Down Expand Up @@ -1537,10 +1477,6 @@ subroutine print_help(l)
call print11(l%layoutnumber, '& with wires and PEC ')
call print11(l%layoutnumber, '& (in conjunction with -n 0 only creates the maps) ')
call print11(l%layoutnumber, '-mapvtk : Creates .VTK map of the PEC/wires/Surface geometry')
#ifdef CompileWithConformal
call print11(l%layoutnumber, '-conf file : conformal file ')
call print11(l%layoutnumber, '-abrezanjas : Thin-gaps treated in conformal manner ')
#endif
call print11(l%layoutnumber, '-dmma : Thin-gaps treated in DMMA manner ')
#ifdef CompileWithMPI
call print11(l%layoutnumber, '-mpidir {x,y,z} : Rotate model to force MPI along z be the largest ')
Expand Down Expand Up @@ -1589,19 +1525,9 @@ subroutine print_help(l)
call print11(l%layoutnumber, buff)
#ifdef CompileWithOpenMP
call print11(l%layoutnumber, 'SUPPORTED: MultiCPU parallel simulation (OpenMP)')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: MultiCPU parallel simulation (OpenMP)')
#endif
!
#ifdef CompileWithMPI
call print11(l%layoutnumber, 'SUPPORTED: MultiCPU/Multinode parallel simulation (MPI)')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: MultiCPU/Multinode parallel simulation (MPI)')
#endif
#ifdef CompileWithConformal
call print11(l%layoutnumber, 'SUPPORTED: Conformal algorithm')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: Conformal algorithm')
#endif
call print11(l%layoutnumber, 'SUPPORTED: Near-to-Far field probes')
call print11(l%layoutnumber, 'SUPPORTED: Lossy anistropic materials, both electric and magnetic')
Expand All @@ -1610,41 +1536,27 @@ subroutine print_help(l)
call print11(l%layoutnumber, 'SUPPORTED: Isotropic Multilayer Skin-depth Materials (sgbc)')
#ifdef CompileWithNIBC
call print11(l%layoutnumber, 'SUPPORTED: Isotropic Multilayer Skin-depth Materials (l%mibc)')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: Isotropic Multilayer Skin-depth Materials (l%mibc)')
#endif
call print11(l%layoutnumber, 'SUPPORTED: Loaded and grounded thin-wires with juntions')
call print11(l%layoutnumber, 'SUPPORTED: Nodal hard/soft electric and magnetic sources')
#ifdef CompileWithHDF
call print11(l%layoutnumber, 'SUPPORTED: .xdmf+.h5 probes ')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: .xdmf+.h5 probes ')
#endif
#ifdef CompileWithOldSaving
call print11(l%layoutnumber, 'SUPPORTED: .fields.old files created (fail-safe)')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: .fields.old files created (fail-safe)')
#endif
#ifdef CompileWithStochastic
call print11(l%layoutnumber, 'SUPPORTED: l%stochastic analysis')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: l%stochastic analysis')
#endif
#ifdef CompileWithPrescale
call print11(l%layoutnumber, 'SUPPORTED: Permittivity scaling accelerations')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: Permittivity scaling accelerations')
#endif
call print11(l%layoutnumber, 'SUPPORTED: Holland Wires')
#ifdef CompileWithBerengerWires
call print11(l%layoutnumber, 'SUPPORTED: Multi-Wires')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: Multi-Wires')
#endif
#ifdef CompileWithSlantedWires
call print11(l%layoutnumber, 'SUPPORTED: Slanted Wires')
#else
!call print11 (l%layoutnumber, 'UNSUPPORTED: Slanted Wires')
#endif
!!!!!!!!!!!!!!!!!
#ifdef CompileWithReal4
Expand Down Expand Up @@ -1749,11 +1661,6 @@ subroutine buscaswitchficheroinput(l)
call print_help(l)
call print_credits(l)
STOP
CASE ('-hh')
call print_credits(l)
call print_help(l)
call print_credits(l)
STOP
CASE ('-i')
num_nfdes = num_nfdes + 1
end select
Expand Down Expand Up @@ -1797,21 +1704,6 @@ subroutine buscaswitchficheroinput(l)
statuse = -1
goto 667
end if
!aniadido para chequear que no haya .conf sin haber invocado el -conf 15/12/16 sgg
inquire(file=trim(adjustl(l%fichin))//CONFEXTENSION, EXIST=l%existeconf)
if ((l%existeconf) .AND. (.not. (l%input_conformal_flag))) then
buff = 'No -conf issued but existing file '//trim(adjustl(l%fichin))//confEXTENSION//' . Either remove file or relaunch with -conf'
call stoponerror(l%layoutnumber, l%num_procs, buff, .true.)
statuse = -1
goto 667
end if
inquire(file=trim(adjustl(l%fichin))//CMSHEXTENSION, EXIST=l%existecmsh)
if ((l%existecmsh) .AND. (.not. (l%input_conformal_flag))) then
buff = 'No -conf issued but existing file '//trim(adjustl(l%fichin))//CMSHEXTENSION//' . Either remove file or relaunch with -conf'
call stoponerror(l%layoutnumber, l%num_procs, buff, .true.)
statuse = -1
goto 667
end if
!
if (temp_numnfdes == 1) then !solo el primero
if (l%layoutnumber == 0) open (194, file='multi_'//trim(adjustl(l%fichin))//NFDEEXTENSION, form='formatted')
Expand Down Expand Up @@ -1843,11 +1735,7 @@ subroutine buscaswitchficheroinput(l)
#ifdef CompileWithMPI
call MPI_Barrier(SUBCOMM_MPI, l%ierr)
#endif
!
!concatenado multiples ORIGINAL 26/06/14

!fin concatenado


temp_numnfdes = 0
if (n > 0) then
i = 2 ! se empieza en 2 porque el primer argumento es siempre el nombre del ejecutable
Expand Down Expand Up @@ -2005,13 +1893,6 @@ subroutine default_flags(l)

l%fatalerror = .false.
l%fatalerrornfde2sgg = .false.
!**************************************************************************************************
!***[conformal] *******************************************************************
!**************************************************************************************************
!conformal existence flags ref: ##Confflag##
l%input_conformal_flag = .false.
l%flag_conf_sgg = .false.
!

l%dontwritevtk = .false.

Expand Down Expand Up @@ -2070,20 +1951,7 @@ subroutine default_flags(l)
l%forcestop = .false.
l%input_conformal_flag = .false.
l%run_with_dmma = .true.
#ifdef CompileWithConformal
l%run_with_dmma = .false.
! todo esto para el abrezanjas. se precisa tambien el l%input_conformal_flag
!!!!quitado sgg ojo 290521 esto no se ha arreglado aim... quito el abrezanjas !290521 bug
!!! l%run_with_abrezanjas = .true. !OJO 0323 A VECES DA ERROR. PONER A FALSE SI SUCEDE
l%run_with_abrezanjas = .false. !OJO 0323 A VECES DA ERROR. PONER A FALSE SI SUCEDE
!!!!l%run_with_abrezanjas = .false.
#else
l%run_with_abrezanjas = .false.
#endif

!fin thin gaps

input_conformal_flag = l%input_conformal_flag !ojooo 051223 es un flag globaaaallll
return
end subroutine default_flags

Expand Down
73 changes: 1 addition & 72 deletions src_main_pub/preprocess_geom.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,10 @@ module Preprocess_m
!
use Report_m
use NFDETypes_m
!healer sgg10
use CreateMatrices_m
!typos que leo desde mi FDE

use FDETYPES_m
use DMMA_m
#ifdef CompileWithConformal
use CONFORMAL_INI_CLASS
use CONFORMAL_TOOLS
use CONFORMAL_MAPPED
use CONFORMAL_TYPES
use Conformal_TimeSteps_m
#endif
use conformal_m, F_X => FACE_X, F_Y => FACE_Y, F_Z => FACE_Z, E_X => EDGE_X, E_Y => EDGE_Y, E_Z => EDGE_Z
implicit none
!!!variables globales del modulo
Expand Down Expand Up @@ -6331,13 +6323,8 @@ subroutine prepro_skindepth(this,fichin)
return

end subroutine !prepro_skindepth
!!!!!!!!end 09/07/13

#ifdef CompileWithConformal
subroutine AssigLossyOrPECtoNodes(sgg,media,conf_conflicts,input_conformal_flag)
#else
subroutine AssigLossyOrPECtoNodes(sgg,media)
#endif
type(SGGFDTDINFO_t), intent(INOUT) :: sgg
type(media_matrices_t), intent(inout) :: media

Expand All @@ -6346,18 +6333,6 @@ subroutine AssigLossyOrPECtoNodes(sgg,media)
integer(kind=4) i,j,k,n,kmenos1,jmenos1,imenos1,med(0:5),r,imed,i1
character(len=BUFSIZE) :: buff

#ifdef CompileWithConformal
type(conf_conflicts_t), pointer :: conf_conflicts
type(conf_node_t), dimension(:), pointer :: conf_busy_node
integer(kind=confIKIND) :: dims
logical :: mediois1,mediois2,mediois3
integer(kind=INTEGERSIZEOFMEDIAMATRICES) :: medio1,medio2,medio3
#endif


!!!lo dejo aqui para en un futuro hacerlo crecer y asignar la informacion de nodo con su tipo de material correctamente
!!copiado de la casuistica de wires !310715 !no esta anulado alli, pero cuando se haga crecer habra que aumenta el sgg%med para acomodar a los nuevos materiales nodales....

do k= sgg%Alloc(iEz)%ZI , sgg%Alloc(iEz)%ZE
do j= sgg%Alloc(iEy)%YI , sgg%Alloc(iEy)%YE
do i= sgg%Alloc(iEx)%XI , sgg%Alloc(iEx)%XE
Expand Down Expand Up @@ -6438,52 +6413,6 @@ subroutine AssigLossyOrPECtoNodes(sgg,media)
end do
end do

!CORRIGE AHORA CON LA INFO CONFORMAL (HABIA UN BUG 211116 PQ EL NODALMENTE IGUALES LO MACHACABA SI ESTO SE HACIA ANTES)
#ifdef CompileWithConformal
if(input_conformal_flag)then
dims =conf_conflicts%conf_busy_nodesGroup%dims
conf_busy_node=> conf_conflicts%conf_busy_nodesGroup%conf_busy_node
do n=1,dims
i=conf_busy_node(n)%i
j=conf_busy_node(n)%j
k=conf_busy_node(n)%k
if (conf_busy_node(n)%ispec) then
media%sggMiNo(i,j,k)=0
end if
end do
!!!conf_busy_node(n)%i = 0
!!!conf_busy_node(n)%j = 0
!!!conf_busy_node(n)%k = 0
!!!conf_busy_node(n)%isfree = .true.
!!!conf_busy_node(n)%ispec = .false.
!!!conf_busy_node(n)%sigmaEquiv = 0.0_RKIND
!!!conf_busy_node(n)%epsilonRelEquiv = 1.0_RKIND
!!!conf_busy_node(n)%muRelEquiv = 1.0_RKIND

!!! Movido a cada wires.F90. Aqui me parece inreportable y peligroso
!!!!pedazo de niapa para poner los sggmiNo conformal a voltage nulo y que Dios reparta suerte 130220
!!! !barro el interior, por eso el shifing k,x - j,z - i,y
!!! Do k=sgg%alloc(iHx)%ZI , sgg%alloc(iHx)%ZE
!!! Do j=sgg%alloc(iHz)%YI , sgg%alloc(iHz)%YE
!!! Do i=sgg%alloc(iHy)%XI , sgg%alloc(iHy)%XE
!!! medio1 =sggMiEx(i,j,k)
!!! medio2 =sggMiEy(i,j,k)
!!! medio3 =sggMiEz(i,j,k)
!!! mediois1= sgg%med(medio1)%is%already_YEEadvanced_byconformal .or. sgg%med(medio1)%is%split_and_useless
!!! mediois2= sgg%med(medio2)%is%already_YEEadvanced_byconformal .or. sgg%med(medio2)%is%split_and_useless
!!! mediois3= sgg%med(medio3)%is%already_YEEadvanced_byconformal .or. sgg%med(medio3)%is%split_and_useless
!!! if (mediois1.or.mediois2.or.mediois3) then
!!! sggMiNo(i,j,k)=0 !ojo !esto no sirve para contactos conformal SGBC-wires, solo para conformal PEC-wires
!!! end if
!!! End do
!!! End do
!!! End do
!!!!fin pedado de niapa


end if
#endif

return
end subroutine AssigLossyOrPECtoNodes

Expand Down
Loading
Loading