Merge pull request #143 from OpenSEMBA/dev

Dev

Author: lmdiazangulo

.gitignore

@@ -21,6 +21,9 @@
 *.mod
 *.smod
 
+# Python env
+venv/
+
 # Compiled Static libraries
 *.lai
 *.la

src_main_pub/getargs.F90

@@ -3,54 +3,21 @@
 Module Getargs
    USE NFDETYPES , ONLY: BUFSIZE
    implicit none
-   private
+   private 
 
    public getcommandargument,commandargumentcount
 
 contains
 
    subroutine getcommandargument(chain2,posic,argum,length,status)
-      character (LEN=BUFSIZE)  ::  chain2,argum
-      integer (kind=4)  ::  i,length,status,posic,n,comienzo,finale,j
-
-      !length is unused
-      !first remove all multiple blanks
-      do i=1,len(trim(adjustl(chain2)))
-         if (chain2(i : i)==' ') then
-            rebus: do j=i+1,len(trim(adjustl(chain2)))
-               if (chain2(j : j)/=' ') then
-                  chain2(i+1 :)=chain2(j :)
-                  exit rebus
-               endif
-            end do rebus
-         endif
-      end do
+      character (LEN=BUFSIZE)  ::chain2, argum, argument
+      integer (kind=4)  :: length, status, posic
+      integer (kind=4) :: n
 
+      CALL getarg(posic, argument)
+      
+      argum = argument
       status=0
-      comienzo=0
-      finale=0
-      chain2=' '//trim(adjustl(chain2))//' '
-      n=0
-      busqueda1 :  do i=1,len(trim(adjustl(chain2)))+2
-         if (chain2(i : i)==' ') n=n+1
-         if (n==posic) then
-            do j=i+1,len(trim(adjustl(chain2)))+2
-               if (chain2(j : j)/=' ') comienzo=j
-               exit busqueda1
-            end do
-         endif
-      end do busqueda1
-
-
-      busqueda2 :  do i=comienzo,len(trim(adjustl(chain2)))+2
-         if (chain2(i : i)==' ') then
-            finale=i-1
-            continue
-            exit busqueda2
-         endif
-      end do busqueda2
-      if (comienzo*finale==0) status=1
-      argum=trim(adjustl(chain2(comienzo : finale)))
 
       !100615 para evitar el crlf del .sh
       if ( (argum(1:1) ==char(10)) .or. (argum(1:1) ==char(13)) .or. (argum(1:1)==char( 0)) ) then
@@ -63,36 +30,10 @@ subroutine getcommandargument(chain2,posic,argum,length,status)
 
    function commandargumentcount(chain2)
       character (LEN=BUFSIZE)  ::  chain2
-      integer (kind=4)  ::  status,n,i,j,commandargumentcount
-
-
-      !!if (chain2(1 : 5)=='-----') then
-      !!    n=command_argument_count()
-      !!else
-      !length is unused
-      !first remove all multiple blanks
-      do i=1,len(trim(adjustl(chain2)))
-         if (chain2(i : i)==' ') then
-            rebus: do j=i+1,len(trim(adjustl(chain2)))
-               if (chain2(j : j)/=' ') then
-                  chain2(i+1 :)=chain2(j :)
-                  exit rebus
-               endif
-            end do rebus
-         endif
-      end do
-
-
-      n=1
-      do i=1,len(trim(adjustl(chain2)))
-         if (chain2(i : i)==' ') then
-            n=n+1
-         endif
-      end do
+      integer (kind=4)  ::  status,n,commandargumentcount
+      n = command_argument_count()  
       status=0
-      !!!!!!endif
       commandargumentcount=n
       return
    end function
-
 end module

src_main_pub/interpreta_switches.F90

@@ -198,7 +198,7 @@ subroutine interpreta(l,statuse)
       !goto 668
    END IF
    l%opcionestotales=''
-   do i=2,n
+   do i=1,n
       CALL getcommandargument (l%chaininput,i,l%chain,l%length,statuse)
       IF (statuse /= 0) THEN
          CALL stoponerror (l%layoutnumber, l%size, 'Reading input',.true.)
@@ -211,7 +211,7 @@ subroutine interpreta(l,statuse)
 
 
    IF (n > 0) THEN
-      i = 2  ! se empieza en 2 porque el primer argumento es siempre el nombre del ejecutable
+      i = 1  ! se empieza en 1 porque el primer argumento es siempre el nombre del ejecutable
       DO while (i <= n)
          CALL getcommandargument (l%chaininput, i, l%chain, l%length, statuse)
          IF (statuse /= 0) THEN
@@ -1791,7 +1791,7 @@ subroutine buscaswitchficheroinput(l)
 
    IF (n > 0) THEN
       num_nfdes=0
-      i = 2
+      i = 1
       DO while (i <= n)
          CALL getcommandargument (l%chain2, i, l%chain, l%length, statuse)
          IF (statuse /= 0) THEN
@@ -1835,7 +1835,7 @@ subroutine buscaswitchficheroinput(l)
       END DO
       if (num_nfdes > 1) then
          temp_numnfdes=0
-         i = 2 ! se empieza en 2 porque el primer argumento es siempre el nombre del ejecutable
+         i = 1 ! se empieza en 1 porque el primer argumento es siempre el nombre del ejecutable
          DO while (i <= n)
             CALL getcommandargument (l%chain2, i, l%chain, l%length, statuse)
              IF (statuse /= 0) THEN
@@ -1924,7 +1924,7 @@ subroutine buscaswitchficheroinput(l)
 
    temp_numnfdes=0
    IF (n > 0) THEN
-   i = 2  ! se empieza en 2 porque el primer argumento es siempre el nombre del ejecutable
+   i = 1  ! se empieza en 1 porque el primer argumento es siempre el nombre del ejecutable
       DO while (i <= n)
          CALL getcommandargument (l%chain2, i, l%chain, l%length, statuse)
          IF (statuse /= 0) THEN

src_main_pub/semba_fdtd.F90

@@ -333,7 +333,7 @@ PROGRAM SEMBA_FDTD_launcher
 !!!!!!!!!!!!!!!!!!!!!!!
    sgg%extraswitches=parser%switches
 !!!da preferencia a los switches por linea de comando
-   CALL getcommandargument (l%chain2, 1, chaindummy, l%length, statuse)
+   CALL getcommandargument (l%chain2, 0, chaindummy, l%length, statuse)
 
    l%chain2=trim(adjustl(l%chain2))
    chaindummy=trim(adjustl(chaindummy))

src_pyWrapper/pyWrapper.py

@@ -296,7 +296,6 @@ def run(self):
 
         os.chdir(self.getFolder())
         self.output = subprocess.run(self.run_command)
-
         self._hasRun = True
         assert self.hasFinishedSuccessfully()
 

test/pyWrapper/test_full_system.py

@@ -1,6 +1,7 @@
 from utils import *
 from typing import Dict
 import os
+from sys import platform
 
 @no_mtln_skip
 @pytest.mark.mtln
@@ -431,8 +432,22 @@ def getPeakPulse(probe:Probe) -> Dict:
     np.testing.assert_almost_equal(getPeakPulse(rectilinearFrontProbe)['time'], getPeakPulse(noRectilinearFrontProbe)['time'], decimal=_TIME_TOLERANCE)
     np.testing.assert_almost_equal(getPeakPulse(rectilinearVertexProbe)['value'], getPeakPulse(noRectilinearVertexProbe)['value'], decimal=_FIELD_TOLERANCE)
     np.testing.assert_almost_equal(getPeakPulse(rectilinearVertexProbe)['time'], getPeakPulse(noRectilinearVertexProbe)['time'], decimal=_TIME_TOLERANCE)
-
-
 
+def testCanExecuteFDTDFromFolderWithSpaces(tmp_path):
+    projectRoot = os.getcwd()
+    folderWitSpaces: str  = os.path.join(tmp_path, "folder with spaces")
+    os.mkdir(folderWitSpaces)
+    if platform == 'win32':
+        shutil.copy2(NGSPICE_DLL, folderWitSpaces)
+ 
+    sembaExecutable = SEMBA_EXE.split(os.path.sep)[-1]
+    pathToExe: str = os.path.join(folderWitSpaces, sembaExecutable)
+    shutil.copy2(SEMBA_EXE, pathToExe)
+    print(pathToExe)
+    
+    fn = CASES_FOLDER + "dielectric/dielectricTransmission.fdtd.json"
+    solver = FDTD(fn, path_to_exe=pathToExe, run_in_folder=tmp_path)
+    solver.run()
+    assert (Probe(solver.getSolvedProbeFilenames("outside")[0]) is not None)
 
 

test/pyWrapper/utils.py

@@ -33,7 +33,7 @@
 elif platform == "win32":
     SEMBA_EXE = os.path.join(os.getcwd(), 'build', 'bin', 'semba-fdtd.exe')
 
-
+NGSPICE_DLL = os.path.join(os.getcwd(), 'precompiled_libraries', 'windows-intel', 'ngspice', 'ngspice.dll')
 TEST_DATA_FOLDER = os.path.join(os.getcwd(), 'testData/')
 CASES_FOLDER = os.path.join(TEST_DATA_FOLDER, 'cases/')
 MODELS_FOLDER = os.path.join(TEST_DATA_FOLDER, 'models/')