Merge pull request #130 from OpenSEMBA/dev

Dev

Author: lmdiazangulo

.github/workflows/automatic-release-ubuntu-gnu.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       matrix: 
         build-type: ["Release"]
-        mpi: ["No"]
+        mpi: ["Yes"]
         mtln: ["Yes"]
         hdf: ["Yes"]
 
@@ -48,6 +48,10 @@ jobs:
         python -m pip install -r requirements.txt
 
     - name: Run wrapper tests
+      env:
+        SEMBA_FDTD_ENABLE_MPI: ${{ matrix.mpi }}
+        SEMBA_FDTD_ENABLE_MTLN: ${{ matrix.mtln }}
+        SEMBA_FDTD_ENABLE_HDF: ${{ matrix.hdf }}
       run: |
         python -m pytest test
 

.github/workflows/automatic-release-windows-intelLLVM.yml

@@ -56,6 +56,10 @@ jobs:
         python -m pip install -r requirements.txt
 
     - name: Run all wrapper tests (except codemodel)
+      env:
+        SEMBA_FDTD_ENABLE_MPI: ${{ matrix.mpi }}
+        SEMBA_FDTD_ENABLE_MTLN: ${{ matrix.mtln }}
+        SEMBA_FDTD_ENABLE_HDF: ${{ matrix.hdf }}
       run: python -m pytest -m 'not codemodel' test/
 
     - name: Get current date

src_main_pub/fdetypes.F90

@@ -66,21 +66,13 @@ module  FDETYPES
    !y esto debe desaparecer
    integer(kind=4)  :: SUBCOMM_MPI_conformal_probes,MPI_conformal_probes_root
 !!!
-
-#if (defined MaxCores)
-   integer(kind=4), parameter  :: maxcores = MaxCores
-#else
-   integer(kind=4), parameter  :: maxcores = 2048
-#endif
-
-
    integer (kind=8),  parameter  ::  maxmpibytes = 2**27
    integer (kind=4),  parameter  ::  BuffObse=2**10 !Steps of the temporal buffer to store evolution data
    integer (kind=8),  parameter  ::  MaxMemoryProbes=2_8**37_8 !128 Gb Maximum bytes of the buffer to store evolution data
    integer (kind=8),  parameter  ::  MaxProbes=150000 !Maximum number of probes (a limit of 200000 is set with ulimit in Linux)
    !
    !
-   INTEGER, parameter :: topCPUtime=10000000 !maximum cpu time in minutes !set to 690 in UGRGRID
+   INTEGER, parameter :: topCPUtime=10000000 !maximum cpu time in minutes 
    !size of character strings 
    INTEGER, parameter :: BUFSIZE=1024
    INTEGER, parameter :: BUFSIZE_LONG=16384

src_main_pub/interpreta_switches.F90

@@ -1220,7 +1220,7 @@ subroutine interpreta(l,statuse)
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   if ((l%run)) then  !el modo run crea el semaforo pause para permiter encolados salvajes en ugrgrid
+   if ((l%run)) then 
 #ifdef keeppause
           !!!solo para el cluster
                   INQUIRE (file='running', EXIST=hayinput)

src_main_pub/observation.F90

@@ -170,11 +170,6 @@ subroutine InitObservation(sgg,sggMiEx,sggMiEy,sggMiEz,sggMiHx,sggMiHy,sggMiHz,s
       integer (kind=4) :: timesteps,klk,fqlength
       integer :: my_iostat
 !
-      
-   if (size.gt.maxcores) then
-       print *,'Maximum cores ',maxcores,' reached.  to recompile'
-       stop
-   endif
       eps0=eps00; mu0=mu00; !chapuz para convertir la variables de paso en globales
 !
 !!

src_main_pub/semba_fdtd.F90

@@ -147,11 +147,6 @@ PROGRAM SEMBA_FDTD_launcher
 #endif
       call setglobal(l%layoutnumber,l%size) !para crear variables globales con info MPI
 
-      if (l%size.gt.maxcores) then
-         print *,'Maximum cores ',maxcores,' reached.  to recompile'
-         stop
-      endif
-      
       WRITE (whoamishort, '(i5)') l%layoutnumber + 1
       WRITE (whoami, '(a,i5,a,i5,a)') '(', l%layoutnumber + 1, '/', l%size, ') '
 

src_main_pub/timestepping.F90

@@ -1,28 +1,3 @@
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! MIT License
-! 
-! Copyright (c) 2023 University of Granada
-! 
-! Permission is hereby granted, free of charge, to any person obtaining a copy
-! of this software and associated documentation files (the "Software"), to deal
-! in the Software without restriction, including without limitation the rights
-! to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-! copies of the Software, and to permit persons to whom the Software is
-! furnished to do so, subject to the following conditions:
-! 
-! The above copyright notice and this permission notice shall be included in all
-! copies or substantial portions of the Software.
-! 
-! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-! IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-! SOFTWARE.
-!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-    
-    
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !  SEMBA_FDTD sOLVER MODULE
 !  Creation date Date :  April, 8, 2010
@@ -269,10 +244,6 @@ subroutine launch_simulation(sgg,sggMtag,tag_numbers, sggMiNo,sggMiEx,sggMiEy,sg
       !*******************************************************************************
       !*******************************************************************************
 
-       if (size.gt.maxcores) then
-           print *,'Maximum cores ',maxcores,' reached.  to recompile'
-           stop
-       endif
       planewave_switched_off=.false.
       fatalerror=.false.
       parar=.false.

src_main_pub/version.F90

@@ -1,8 +1,5 @@
 module  version 
-character (128), parameter :: compdate= &  
-' Tue Jul 16 12:00:00 2023 +0000' // & 
-' '  
-character(128), parameter :: dataversion= & 
-'SEMBA-FDTD Version v1.0 (Release)' // &
-trim(adjustl(compdate))  
-end module version 
+character (128), parameter :: compdate= __DATE__ // " " // __TIME__  
+character(128), parameter :: dataversion=&
+'SEMBA-FDTD Version v1.0. Compiled on: ' // trim(adjustl(compdate))  
+end module version