diff --git a/HEN_HOUSE/egs++/geometry/egs_box/egs_box.h b/HEN_HOUSE/egs++/geometry/egs_box/egs_box.h index 5170608d4..b63a33bcb 100644 --- a/HEN_HOUSE/egs++/geometry/egs_box/egs_box.h +++ b/HEN_HOUSE/egs++/geometry/egs_box/egs_box.h @@ -90,7 +90,7 @@ A simple example: :start geometry: name = my_box library = egs_box - box size = 1 2 3 + box size = 2 4 6.2 # -1 < x < 1; -2 < y < 2; 3.1 < z < 3.1 :start media input: media = water :stop media input: diff --git a/HEN_HOUSE/gui/egs_configure/egs_tools.cpp b/HEN_HOUSE/gui/egs_configure/egs_tools.cpp index b6facd06a..f5e73b9d6 100644 --- a/HEN_HOUSE/gui/egs_configure/egs_tools.cpp +++ b/HEN_HOUSE/gui/egs_configure/egs_tools.cpp @@ -769,7 +769,7 @@ EGS_DSO::EGS_DSO(const QString &cpp_name){ #elif defined(Q_OS_LINUX) || defined(Q_OS_UNIX) fpic = is_x86_64() ? "-fPIC" : QString(); #endif - flibs = cpp_name.contains("g++") ? "-lgfortran" : QString(); + flibs = cpp_name.contains("g++") ? "-lgfortran -lquadmath" : QString(); } // Initialize default GCC compiler as gfortran @@ -1007,7 +1007,7 @@ QString MCompiler::getFlibs2LinkCPP( const QString &f_name, const QString &a_pat if ( f_name.contains("g77") && name().contains("g++")) flibs= QString("-lg2c"); else if ( f_name.contains("gfortran") && name().contains("g++")) - flibs= QString("-lgfortran"); + flibs= QString("-lgfortran -lquadmath"); else if ( f_name.contains("ifort") && name().contains("icpc")) flibs= QString("-lifport -lifcore"); else{// using any other C++/Fortran compiler combination @@ -1020,7 +1020,7 @@ QString MCompiler::getFlibs2LinkCPP( const QString &f_name, const QString &a_pat #else // Setting an initial guess if ( f_name.contains("gfortran") && name().contains("g++") ) - flibs="-lgfortran"; + flibs="-lgfortran -lquadmath"; else if ( f_name.contains("g77") ) flibs="-lg2c"; else if ( f_name.contains("ifort") && name().contains("icpc")) diff --git a/HEN_HOUSE/scripts/configure b/HEN_HOUSE/scripts/configure index af0406d37..cd52650e6 100755 --- a/HEN_HOUSE/scripts/configure +++ b/HEN_HOUSE/scripts/configure @@ -1813,7 +1813,7 @@ if test x$F77 = xg77 || test x$F77 = xgfortran; then if test x$F77 = xg77; then SHLIB_LIBS="-lg2c" else - SHLIB_LIBS="-lgfortran" + SHLIB_LIBS="-lgfortran -lquadmath" fi printf $format "An OS X system with $F77 and $CC ... " >&2 echo "using $SHLIB_FLAGS and $SHLIB_LIBS to build shared libraries" >&2 diff --git a/HEN_HOUSE/specs/all_common.spec b/HEN_HOUSE/specs/all_common.spec index ed7a1d287..6bce420ac 100644 --- a/HEN_HOUSE/specs/all_common.spec +++ b/HEN_HOUSE/specs/all_common.spec @@ -132,9 +132,11 @@ FEXT = f # The git hash and branch GIT_HASH = ifeq ($(OS),Windows_NT) - USING_GIT = $(shell cmd /C git rev-parse --is-inside-work-tree) + USING_GIT = $(shell cmd /C @ECHO OFF & git rev-parse --is-inside-work-tree 2>NUL) ifeq ($(USING_GIT),true) GIT_HASH = -DGIT_HASH="\"$(shell cmd /C git rev-parse --short=7 HEAD)\"" + else + GIT_HASH = -DGIT_HASH="\"unknown\"" endif else GIT_HASH = -DGIT_HASH="\"$(shell if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then git rev-parse --short=7 HEAD; fi)\"" @@ -142,7 +144,7 @@ endif COMPILE_TIME = ifeq ($(OS),Windows_NT) - COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T)$(shell cmd /C time /T) $(shell cmd /C tzutil /g)\"" + COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T) $(shell cmd /C time /T)\"" else COMPILE_TIME = -DCOMPILE_TIME="\"$(shell date -u +'%Y-%m-%d %H:%M:%S UTC')\"" endif diff --git a/HEN_HOUSE/specs/beamnrc.spec b/HEN_HOUSE/specs/beamnrc.spec index eb9aff304..0078b07eb 100644 --- a/HEN_HOUSE/specs/beamnrc.spec +++ b/HEN_HOUSE/specs/beamnrc.spec @@ -120,9 +120,11 @@ LIB_SOURCES = $(BEAM_HOME)beam_lib.macros \ # The git hash and branch GIT_HASH = ifeq ($(OS),Windows_NT) - USING_GIT = $(shell cmd /C git rev-parse --is-inside-work-tree) + USING_GIT = $(shell cmd /C @ECHO OFF & git rev-parse --is-inside-work-tree 2>NUL) ifeq ($(USING_GIT),true) GIT_HASH = -DGIT_HASH="\"$(shell cmd /C git rev-parse --short=7 HEAD)\"" + else + GIT_HASH = -DGIT_HASH="\"unknown\"" endif else GIT_HASH = -DGIT_HASH="\"$(shell if git rev-parse --is-inside-work-tree > /dev/null 2>&1; then git rev-parse --short=7 HEAD; fi)\"" @@ -130,7 +132,7 @@ endif COMPILE_TIME = ifeq ($(OS),Windows_NT) - COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T)$(shell cmd /C time /T) $(shell cmd /C tzutil /g)\"" + COMPILE_TIME = -DCOMPILE_TIME="\"$(shell cmd /C date /T)$(shell cmd /C time /T)\"" else COMPILE_TIME = -DCOMPILE_TIME="\"$(shell date -u +'%Y-%m-%d %H:%M:%S UTC')\"" endif diff --git a/README.md b/README.md index fd48fb165..d57c7fe02 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,19 @@ -## What is EGSnrc? +# EGSnrc + +[![badge-doi](https://badgen.net/static/doi/10.4224%2F40001303/)](https://doi.org/10.4224/40001303) +[![badge-doi](https://badgen.net/static/licence/AGPL-3.0-or-later/green)](./LICENCE) +[![badge-doi](https://badgen.net/static/cite/bibtex/orange)](https://github.com/nrc-cnrc/EGSnrc/wiki/Citing-EGSnrc#bibtex-entry) EGSnrc is a software toolkit to perform Monte Carlo simulation of ionizing radiation transport through matter. It models the propagation of photons, electrons and positrons with kinetic energies between 1 keV and -10 GeV, in homogeneous materials. EGSnrc was originally released in 2000, +10 GeV, in homogeneous materials. EGSnrc was first released in 2000, as a complete overhaul of the Electron Gamma Shower (EGS) software package originally developed at the Stanford Linear Accelerator Center (SLAC) in the 1970s. Most notably, EGSnrc incorporates crucial refinements in charged particle transport, better low energy cross sections, and the egs++ class library to model elaborate geometries and particle sources. -[doi:10.4224/40001303](https://doi.org/10.4224/40001303) - ## Documentation - [**Citing EGSnrc**](https://github.com/nrc-cnrc/EGSnrc/wiki/Citing-EGSnrc)