Merge pull request #234 from OpenSEMBA/dev

Merge Dev to master

Author: lmdiazangulo

.gitignore

@@ -68,3 +68,6 @@ testData/outputs/paul/paul_8.6_square.txt
 testing_hdf5_writing_and_reading.h5
 build
 fort.17
+
+src_main_pub/version.F90
+git_info.txt

CMakeLists.txt

@@ -44,9 +44,6 @@ add_definitions(
 	-DCompileWithInt2 
 	-DCompileWithOpenMP
 )
-if (CMAKE_BUILD_TYPE STREQUAL "Debug")
-	add_definitions(-DCompileWithDebug)
-endif()
 
 include("${CMAKE_CURRENT_SOURCE_DIR}/set_precompiled_libraries.cmake")
 
@@ -151,6 +148,8 @@ else()
 	message(FATAL_ERROR "Unrecognized system name")
 endif()
 
+# =========================================
+
 add_subdirectory(external)
 
 add_library(semba-types 
@@ -228,6 +227,16 @@ if(SEMBA_FDTD_OUTPUTS_LIB)
 endif()
 
 if(SEMBA_FDTD_MAIN_LIB)
+	# Prepares variables containing information on commit-hash and build flags.
+	# This information is only available at the configuration stage.
+	set(PROGRAM_NAME "semba-fdtd")
+	include("${CMAKE_CURRENT_SOURCE_DIR}/get_commit_info.cmake")
+	configure_file(
+	${CMAKE_SOURCE_DIR}/src_main_pub/version.F90.in
+	${CMAKE_SOURCE_DIR}/src_main_pub/version.F90
+	@ONLY
+	)
+
 	add_library(semba-main
 		"src_main_pub/semba_fdtd.F90"
 		"src_main_pub/calc_constants.F90"

doc/tutorials/veritasium/closedCircuit.fdtd.json

@@ -114,6 +114,7 @@
             "component": "magnitude",
             "elementIds": [7],
             "domain": {
+                "type": "time",
                 "initialTime": 0.0, 
                 "finalTime": 2e-7, 
                 "samplingPeriod": 1.5e-10

get_commit_info.cmake

@@ -0,0 +1,28 @@
+if(EXISTS "${CMAKE_SOURCE_DIR}/.git")
+    # The most common situation is that code is being compiled from a git repository.
+    # This assumes access to the git command and .git folder.
+    find_program(GIT_EXECUTABLE git)
+    if(GIT_EXECUTABLE)
+        execute_process(
+            COMMAND ${GIT_EXECUTABLE} rev-parse --short HEAD
+            WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+            OUTPUT_VARIABLE GIT_COMMIT
+            OUTPUT_STRIP_TRAILING_WHITESPACE
+        )
+    endif()
+
+    message(STATUS "Git commit info found using git command: ${GIT_COMMIT}")
+elseif(EXISTS "${CMAKE_SOURCE_DIR}/git_info.txt")
+    # git_info.txt is generated with the script write_git_info.sh
+    # The intended use case for this is when the code is planned to be deployed
+    # in a system which has no access to the command git and/or the .git folder.
+    file(READ "${CMAKE_SOURCE_DIR}/git_info.txt" GIT_INFO_CONTENT)
+	string(REGEX MATCH "GIT_COMMIT=\"([^\"]+)\"" _ "${GIT_INFO_CONTENT}")
+	set(GIT_COMMIT "${CMAKE_MATCH_1}")
+
+	message(STATUS "Git commit info found in git_info.txt: ${GIT_COMMIT}")
+else()
+    set(GIT_COMMIT "UNKNOWN")
+
+	message(STATUS "Git commit info not found, setting as ${GIT_COMMIT}")
+endif()

src_main_pub/errorreport.F90

@@ -2126,7 +2126,7 @@ function openfile_mpi(layoutnumber,nombrefich) result (thefile8)
 !      IF (layoutnumber == 0) THEN
 669      open (newunit=thefile8,file=trim(adjustl(nombrefich))//trim(adjustl(whoamishort))//'_tmp',err=667 )
          goto 668
-667      print *,' '//trim(adjustl(whoamishort))//' ','--> no hay cojones con open para borrar unidad ',thefile8
+667      print *,' '//trim(adjustl(whoamishort))//' ','--> no se pudo borrar la unidad usando open',thefile8
          call sleep(2)
          goto 669
 668     continue        

src_main_pub/interpreta_switches.F90

@@ -1392,12 +1392,22 @@ subroutine print_credits(l)
       if (l%creditosyaprinteados) return
       l%creditosyaprinteados=.true.
       CALL print11 (l%layoutnumber, '=========================')
-      CALL print11 (l%layoutnumber, 'SEMBA-FDTD SOLVER')
+      CALL print11 (l%layoutnumber, program_name)
       CALL print11 (l%layoutnumber, '=========================')
 
       WRITE (dubuf,*) SEPARADOR // SEPARADOR // SEPARADOR
       CALL print11 (l%layoutnumber, dubuf)
-      WRITE (dubuf,*) trim (adjustl(dataversion))
+      CALL print11 (l%layoutnumber, 'Compilation date: ' // compilation_date)
+      CALL print11 (l%layoutnumber, 'Compiler Id: ' // compiler_id)
+      CALL print11 (l%layoutnumber, 'git commit: ' // git_commit)
+      CALL print11 (l%layoutnumber, 'cmake build type: ' // cmake_build_type)
+      if (cmake_build_type == "Debug") then
+         CALL print11 (l%layoutnumber, 'cmake compilation flags: ' // compilation_flags_debug)
+      elseif(cmake_build_type == "Release") then
+         CALL print11 (l%layoutnumber, 'cmake compilation flags: ' // compilation_flags_release)
+      else
+         CALL print11 (l%layoutnumber, 'cmake compilation flags: ' // compilation_flags)
+      endif
       CALL print11 (l%layoutnumber, dubuf)
       WRITE (dubuf,*) SEPARADOR // SEPARADOR // SEPARADOR
       CALL print11 (l%layoutnumber, dubuf)