Skip to content

fix input file name bug #23

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

Open
Plutoniumdrache wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix input file name bug #23

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
11 changes: 10 additions & 1 deletion WRAPPER/src/WRAPPER.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,9 @@ SUBROUTINE DISCON(avrSWAP, aviFAIL, accINFILE, avcOUTNAME, avcMSG) BIND (C, NAME
CHARACTER(SIZE(avcMSG)-1) :: ErrMsg ! a Fortran version of the C string argument (not considered an array here) [subtract 1 for the C null-character]
INTEGER(4) :: iDLL ! Counter
INTEGER(HANDLE) :: FileAddr ! The address of file FileName. (RETURN value from LoadLibrary in kernel32.f90)
INTEGER(LPVOID) :: ProcAddr ! The address of procedure ProcName. (RETURN value from GetProcAddress in kernel32.f90)
INTEGER(LPVOID) :: ProcAddr ! The address of procedure ProcName. (RETURN value from GetProcAddress in kernel32.f90)
CHARACTER(1024) :: SubDLLInputFile ! Name of the input file for the sub-DLL (.IN)
INTEGER(4) :: SubDLLInputLen ! Number of characters of the name of the .IN file.

TYPE(LidarVariables), SAVE :: LidarVar ! lidar related variable type
TYPE(LidarErrorVariables), SAVE :: ErrVar ! lidar related error type
Expand Down Expand Up @@ -93,6 +95,13 @@ END SUBROUTINE BladedDLL_Legacy_Procedure
RETURN
ELSE ! if the address is correctly associated, then we can run the DLL
CALL C_F_PROCPOINTER(LidarVar%PROCADDR(iDLL), DLL_Legacy_Subroutine)

! The following 4 lines fix the bug that no IN file names are supported that are shorter than the IN file name of the WRAPPER itself.
SubDLLInputFile = ''
SubDLLInputFile = TRIM(LidarVar%DLLINPUTFILENAME(iDLL)) // C_NULL_CHAR
SubDLLInputLen = LEN_TRIM(LidarVar%DLLINPUTFILENAME(iDLL)) + 1
avrSWAP(50) = REAL(SubDLLInputLen, C_FLOAT)

CALL DLL_Legacy_Subroutine (avrSWAP, aviFAIL, TRIM(LidarVar%DLLINPUTFILENAME(iDLL))//C_NULL_CHAR, avcOUTNAME, avcMSG )
END IF
END DO
Expand Down