diff --git a/src_main_pub/fdetypes.F90 b/src_main_pub/fdetypes.F90 index ccd125a6..31ad1691 100755 --- a/src_main_pub/fdetypes.F90 +++ b/src_main_pub/fdetypes.F90 @@ -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 diff --git a/src_main_pub/interpreta_switches.F90 b/src_main_pub/interpreta_switches.F90 index 6ca8f2b4..68d5b8b6 100755 --- a/src_main_pub/interpreta_switches.F90 +++ b/src_main_pub/interpreta_switches.F90 @@ -80,8 +80,6 @@ module interpreta_switches_m existeh5, & fatalerror, & fatalerrornfde2sgg, & - existeconf, & - existecmsh, & thereare_stoch, & experimentalVideal, & simu_devia, & @@ -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)) @@ -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 @@ -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. ') @@ -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 ') @@ -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') @@ -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 @@ -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 @@ -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') @@ -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 @@ -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. @@ -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 diff --git a/src_main_pub/preprocess_geom.F90 b/src_main_pub/preprocess_geom.F90 index 79ff8622..64dad6f5 100644 --- a/src_main_pub/preprocess_geom.F90 +++ b/src_main_pub/preprocess_geom.F90 @@ -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 @@ -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 @@ -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 @@ -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 diff --git a/src_main_pub/semba_fdtd.F90 b/src_main_pub/semba_fdtd.F90 index a8f591f0..faeb693b 100755 --- a/src_main_pub/semba_fdtd.F90 +++ b/src_main_pub/semba_fdtd.F90 @@ -32,13 +32,6 @@ module SEMBA_FDTD_m #endif #endif -#ifdef CompileWithConformal - use CONFORMAL_INI_CLASS - use CONFORMAL_TOOLS - use CONFORMAL_MAPPED - use CONFORMAL_TYPES - use Conformal_TimeSteps_m -#endif use EpsMuTimeScale_m use interpreta_switches_m @@ -112,9 +105,7 @@ subroutine semba_init(this, input_flags) #endif integer(kind=4) :: conf_err -#ifdef CompileWithConformal - type(conf_conflicts_t), pointer :: conf_conflicts -#endif + call initEntrada(this%l) #ifdef CompileWithSMBJSON newrotate=.false. @@ -408,123 +399,10 @@ subroutine semba_init(this, input_flags) call stoponerror (this%l%layoutnumber, this%l%num_procs, 'Error in .nfde file syntax. Check all *Warnings* and *tmpWarnings* files, correct and remove pause file if any',.true.); goto 652 end if - !************************************************************************* - !***[conformal] ****************************************** - !************************************************************************* - !conformal conformal ini ref: ##Confini## -#ifdef CompileWithConformal - if (this%l%input_conformal_flag) then - - !md notes: - ![1] Todos los procesos parsean el archivo -conf completo. - ![2] El parseador es INDEPENDIENTE de del resto del problema (dimensiones, - ! particion MPI, ... ) - ![3] Posteriormente conf_mesh obtenido por el parseador sera tratado por cada - ! proceso atendiedo al resto del porblema y la particion MPI - - conf_parameter%output_file_report_id = 47; - !...................................................................... - write(dubuf,*) 'Init Searching for Conformal Mesh ...'; call print11(this%l%layoutnumber,dubuf) -#ifdef CompileWithMPI - call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) - call conformal_ini (TRIM(this%l%conformal_file_input_name),trim(this%l%fileFDE),parser,& - &this%sgg, this%media%sggMiEx,this%media%sggMiEy,this%media%sggMiEz,this%media%sggMiHx,this%media%sggMiHy,this%media%sggMiHz,this%l%run_with_abrezanjas,& - &this%fullsize,this%l%layoutnumber,this%l%mpidir, this%l%input_conformal_flag,conf_err,this%l%verbose) -#endif - !...................................................................... -#ifndef CompileWithMPI - !call conformal_ini (TRIM(this%l%conformal_file_input_name),trim(this%l%fileFDE),sgg,fullsize,0,conf_err,this%l%verbose) - call conformal_ini (TRIM(this%l%conformal_file_input_name),trim(this%l%fileFDE),parser,& - &this%sgg, this%media%sggMiEx,this%media%sggMiEy,this%media%sggMiEz,this%media%sggMiHx,this%media%sggMiHy,this%media%sggMiHz,& - &this%l%run_with_abrezanjas,this%fullsize,0,this%l%mpidir,this%l%input_conformal_flag,conf_err,this%l%verbose) -#endif - if(conf_err/=0)then - call WarnErrReport(Trim(buff),.true.) - end if - -#ifdef CompilePrivateVersion - if (trim(adjustl(this%l%extension))=='.nfde') then - call Destroy_Parser (parser) - deallocate(NFDE_FILE%lineas) - deallocate(NFDE_FILE) - nullify (NFDE_FILE) - end if -#endif - - !!!!!!!!!!!!!!!!!!!!!!!!!!!!! -#ifdef CompileWithMPI - !wait until everything comes out - call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) - l_auxinput = this%l%input_conformal_flag - call MPI_Barrier(SUBCOMM_MPI,this%l%ierr) - call MPI_AllReduce( l_auxinput, l_auxoutput, 1_4, MPI_LOGICAL, MPI_LOR, MPI_COMM_WORLD, this%l%ierr) - this%l%input_conformal_flag = l_auxoutput -#endif - !...................................................................... -#ifdef CompileWithMPI - call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) -#endif - if (this%l%resume.and.this%l%flag_conf_sgg) then - call stoponerror (this%l%layoutnumber, this%l%num_procs, 'this%l%resume -r currently unsupported by conformal solver',.true.); statuse=-1; !return - end if - if (this%l%input_conformal_flag.and.this%l%flag_conf_sgg) then - write(dubuf,*) '----> Conformal Mesh found'; call print11(this%l%layoutnumber,dubuf) - else - write(dubuf,*) '----> No Conformal Mesh found'; call print11(this%l%layoutnumber,dubuf) - end if - end if !FIN DEL: if (this%l%input_conformal_flag) then - -#endif - - !************************************************************************* - !************************************************************************* - !************************************************************************* - -#ifdef CompileWithConformal - !************************************************************************* - !***[conformal] ****************************************** - !************************************************************************* - !conformal mapped reff: ##Confmapped## - - !call creamatricesdedibujoencadaslabmpi(sgg%alloc(iEx)%XI,....,sgg%Sweep(iEx)%...) - - if (this%l%input_conformal_flag) then - write(dubuf,*) '----> this%l%input_conformal_flag True and init'; call print11(this%l%layoutnumber,dubuf) - call conf_geometry_mapped_for_UGRDTD (& - &conf_conflicts, & - &this%sgg,this%media%sggMiEx,this%media%sggMiEy,this%media%sggMiEz,this%media%sggMiHx,this%media%sggMiHy,this%media%sggMiHz, & - &this%fullsize, this%SINPML_fullsize,this%l%layoutnumber,conf_err,this%l%verbose); - !call conf_geometry_mapped_for_UGRDTD (sgg, fullsize, this%SINPML_fullsize,this%l%layoutnumber,conf_err,this%l%verbose); //refactor JUL15 - if(conf_err==0)then - else - buff=''; buff = 'Program aborted.'; - call WarnErrReport(Trim(buff),.true.) - end if - write(dubuf,*) '----> this%l%input_conformal_flag True and exit'; call print11(this%l%layoutnumber,dubuf) - end if - -#ifdef CompileWithMPI - call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) -#endif - !************************************************************************* - !************************************************************************* - !************************************************************************* -#endif - if (allocated(this%media%sggMiEx)) then !para el this%l%skindepthpre no se allocatea nada -#ifdef CompileWithConformal - call AssigLossyOrPECtoNodes(this%sgg,this%media, conf_conflicts,this%l%input_conformal_flag) -#else call AssigLossyOrPECtoNodes(this%sgg,this%media) -#endif -! #ifdef CompileWithConformal -! call AssigLossyOrPECtoNodes(this%sgg,this%sggMiNo,this%sggMiEx,this%sggMiEy,this%sggMiEz,& -! &conf_conflicts,this%l%input_conformal_flag) -! #else -! call AssigLossyOrPECtoNodes(this%sgg,this%sggMiNo,this%sggMiEx,this%sggMiEy,this%sggMiEz) -! #endif + if (this%l%createmap) call store_geomData (this%sgg,this%media, this%l%geomfile) - ! if (this%l%createmap) call store_geomData (this%sgg,this%sggMiEx,this%sggMiEy,this%sggMiEz,this%sggMiHx,this%sggMiHy,this%sggMiHz, this%l%geomfile) end if ! #ifdef CompileWithMPI @@ -1251,7 +1129,6 @@ subroutine semba_launch(this) ! call each simulation !ojo que los layoutnumbers empiezan en 0 if (this%l%finaltimestep /= 0) then #ifdef CompileWithMPI - !wait until everything comes out call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) #endif this%finishedwithsuccess=.false. @@ -1283,10 +1160,8 @@ subroutine semba_launch(this) call print11 (this%l%layoutnumber, dubuf) call print11 (this%l%layoutnumber, dubuf) end if - !!!!!!! call CLOSEdxfFILE(this%l%layoutnumber,this%l%num_procs) call CLOSEWARNINGFILE(this%l%layoutnumber,this%l%num_procs,dummylog,this%l%stochastic,this%l%simu_devia) !aqui ya no se tiene en cuenta el this%l%fatalerror #ifdef CompileWithMPI - !wait until everything comes out call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) #endif #ifdef CompileWithMPI @@ -1297,10 +1172,8 @@ subroutine semba_launch(this) end if ! #ifdef CompileWithMPI - !wait until everything comes out call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) #endif - end subroutine semba_launch subroutine semba_end(this) @@ -1326,7 +1199,6 @@ subroutine semba_end(this) end if #ifdef CompileWithMPI - !wait until everything comes out call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) #endif ! @@ -1360,22 +1232,6 @@ subroutine semba_end(this) end if end if ! - - !************************************************************************************************** - !***[conformal] ******************************************************************* - !************************************************************************************************** - !delete conformal memory reff: ##Conf_end## -#ifdef CompileWithConformal - if(this%l%input_conformal_flag)then - call conf_sMesh%delete - call conf_timeSteps%delete; - call delete_conf_tools(); - end if -#endif - !************************************************************************************************** - !************************************************************************************************** - !************************************************************************************************** - #ifdef CompileWithMPI call MPI_Barrier(SUBCOMM_MPI,this%l%ierr) #endif @@ -1398,7 +1254,6 @@ subroutine semba_end(this) #ifdef CompileWithMPI call MPI_Barrier (SUBCOMM_MPI, this%l%ierr) #endif - ! Error reading check #ifdef keeppause if (this%l%fatalerror) then @@ -1468,16 +1323,25 @@ end subroutine semba_end subroutine initEntrada(input) type(entrada_t), intent(inout) :: input -#ifdef CompileWithConformal - input%conformal_file_input_name=char(0); -#endif input%geomfile = ' '; - input%prefix = ' ';input%fichin = ' '; input%chain2 = ' '; input%opcionestotales = ' ' - input%nEntradaRoot = ' '; input%fileFDE = ' '; input%fileH5 = ' ' - input%prefixopci = ' '; input%prefixopci1 = ' ';input%opcionespararesumeo = ' '; input%opcionesoriginales = ' ' - input%slicesoriginales = ' '; ; input%chdummy = ' ' - input%flushsecondsFields=0.; input%flushsecondsData=0.; input%time_end=0. - input%existeNFDE=.false.; input%existeconf=.false.; input%existecmsh=.false.; input%existeh5=.false. + input%prefix = ' '; + input%fichin = ' '; + input%chain2 = ' '; + input%opcionestotales = ' ' + input%nEntradaRoot = ' '; + input%fileFDE = ' '; + input%fileH5 = ' ' + input%prefixopci = ' '; + input%prefixopci1 = ' '; + input%opcionespararesumeo = ' '; + input%opcionesoriginales = ' ' + input%slicesoriginales = ' '; + input%chdummy = ' '; + input%flushsecondsFields=0.; + input%flushsecondsData=0.; + input%time_end=0. + input%existeNFDE=.false.; + input%existeh5=.false. input%creditosyaprinteados=.false. call input%EpsMuTimeScale_input_parameters%init0() diff --git a/src_main_pub/timestepping.F90 b/src_main_pub/timestepping.F90 index 510be16c..e941729d 100755 --- a/src_main_pub/timestepping.F90 +++ b/src_main_pub/timestepping.F90 @@ -67,11 +67,6 @@ module Solver_m use estructura_slanted_m #endif - -#ifdef CompileWithConformal - use conformal_time_stepping_m - use CONFORMAL_MAPPED -#endif use EpsMuTimeScale_m use CALC_CONSTANTS_m #ifdef CompileWithPrescale @@ -274,10 +269,6 @@ subroutine solver_init_control(this, input, maxSourceValue, time_desdelanzamient this%control%facesNF2FF = input%facesNF2FF this%EpsMuTimeScale_input_parameters = input%EpsMuTimeScale_input_parameters -#ifdef CompileWithConformal - this%control%input_conformal_flag = input%input_conformal_flag -#endif - call this%thereAre%reset() end subroutine @@ -591,7 +582,6 @@ subroutine solver_init(this) call initializeAnisotropic() call initializeSGBC() call initializeMultiports() - call initializeConformalElements() call initializeEDispersives() call initializeMDispersives() @@ -1358,41 +1348,6 @@ subroutine initializeMultiports() #endif end subroutine initializeMultiports - subroutine initializeConformalElements() - character(len=BUFSIZE) :: dubuf - logical :: l_auxinput, l_auxoutput - -#ifdef CompileWithConformal - if(input_conformal_flag)then -#ifdef CompileWithMPI - call MPI_Barrier(SUBCOMM_MPI,ierr) -#endif - write(dubuf,*) 'Init Conformal Elements ...'; call print11(this%control%layoutnumber,dubuf) -!WIP -!DEBUG - call initialize_memory_FDTD_conf_fields (this%sgg,this%media%sggMiEx, & - & this%media%sggMiEy,this%media%sggMiEz,this%media%sggMiHx,this%media%sggMiHy,this%media%sggMiHz,Ex,Ey,Ez,Hx,Hy,Hz,& - & this%control%layoutnumber,this%control%num_procs, this%control%verbose); - l_auxinput=input_conformal_flag - l_auxoutput=l_auxinput -#ifdef CompileWithMPI - call MPI_Barrier(SUBCOMM_MPI,ierr) - call MPI_AllReduce( l_auxinput, l_auxoutput, 1_4, MPI_LOGICAL, MPI_LOR, MPI_COMM_WORLD, ierr) -#endif - ! refactor JUN2015 - - !!!!!!!sgg 051214 !rellena correctamente los campos magneticos. Necesario para construir los surfaces a partir del wireframe - ! call fillMagnetic(sgg, sggMiEx, sggMiEy, sggMiEz, sggMiHx, sggMiHy, sggMiHz, b) - !!!!!!!ojo solo es valido para PEC!!!! cambiar luego !!?!?!?!?!? - if (l_auxoutput ) then - write (dubuf,*) '----> there are conformal elements'; call print11(this%control%layoutnumber,dubuf) - else - write(dubuf,*) '----> no conformal elements found'; call print11(this%control%layoutnumber,dubuf) - end if - end if -#endif - end subroutine initializeConformalElements - subroutine initializeEDispersives() character(len=bufsize) :: dubuf logical :: l_auxinput, l_auxoutput @@ -1784,12 +1739,7 @@ subroutine solver_run(this) #ifdef CompileWithProfiling call nvtxStartRange("Antes del bucle N") #endif -!240424 sgg creo el comunicador mpi de las sondas conformal aqui. debe irse con el nuevo conformal -#ifdef CompileWithConformal -#ifdef CompileWithMPI - call this%init_MPIConformalProbes() -#endif -#endif + this%still_planewave_time=.true. !inicializacion de la variable flushFF = .false. pscale_alpha=1.0 !se le entra con 1.0 @@ -2078,9 +2028,7 @@ subroutine step(this) call flushPlanewaveOff(planewave_switched_off, this%still_planewave_time, thereareplanewave) call this%AdvanceAnisotropicE() call this%advanceE() -#ifdef CompileWithConformal - if(this%control%input_conformal_flag) call conformal_advance_E() -#endif + call this%advanceWiresE() call this%advancePMLE() #ifdef CompileWithNIBC @@ -2121,10 +2069,6 @@ subroutine step(this) call this%MinusCloneMagneticPMC() call this%CloneMagneticPeriodic() -#ifdef CompileWithConformal - if(this%control%input_conformal_flag) call conformal_advance_H() -#endif - #ifdef CompileWithMPI !!Flush all the MPI (esto estaba justo al principo del bucle temporal diciendo que era necesario para correcto resuming) !lo he movido aqui a 16/10/2012 porque el farfield necesita tener los campos magneticos correctos @@ -2728,10 +2672,6 @@ subroutine solver_end(this) #ifdef CompileWithProfiling call nvtxEndRange #endif - -#ifdef CompileWithConformal - if(this%control%input_conformal_flag) call conformal_final_simulation (conf_timeSteps, this%n) -#endif #ifdef CompileWithMPI call MPI_Barrier(SUBCOMM_MPI,ierr)