JHUAPL/kaiju
1
0
Fork 0
mirror of https://github.com/JHUAPL/kaiju.git synced 2026-01-09 18:57:53 -05:00
Code Issues Packages Projects Releases 1 Wiki Activity

Reverted invalid compiler check in compilers.cmake. Changed loop2d PBS template

Browse Source 
to use setupEnvironmnt.sh.
This commit is contained in:
Eric Winter
2022-03-09 14:59:08 -08:00
parent c54430952e
commit c3ccbbafd7
2 changed files with 8 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmake/compilers.cmake
View File

@@ -102,9 +102,9 @@ if(CMAKE_Fortran_COMPILER_ID MATCHES Intel)
endif()
#Check Intel Fortran version
# if(NOT ALLOW_INVALID_COMPILERS AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER "23")
# message(FATAL_ERROR "Intel Fortran compilers newer than 21 are not supported. Set the ALLOW_INVALID_COMPILERS variable to ON to force compilation at your own risk.")
# endif()
if(NOT ALLOW_INVALID_COMPILERS AND CMAKE_Fortran_COMPILER_VERSION VERSION_GREATER "23")
message(FATAL_ERROR "Intel Fortran compilers newer than 21 are not supported. Set the ALLOW_INVALID_COMPILERS variable to ON to force compilation at your own risk.")
endif()
elseif(CMAKE_Fortran_COMPILER_ID MATCHES GNU)
set(dialect "-ffree-form -ffree-line-length-none -fimplicit-none")

28
quickstart/loop2d/loop2d.pbs.template
View File

@@ -25,36 +25,18 @@ module load python3/3.9.5
echo "The following modules are loaded:"
module list
# Set kaiju-related environment variables.
# Define the kaiju installation location.
export KAIJUHOME=/nobackup/ewinter/kaiju_serial
export KAIJU_INSTALL_DIR=/nobackup/ewinter/kaiju_serial
# Add the kaiju binaries to the PATH.
export KAIJU_BIN=$KAIJUHOME/build/bin
export PATH=$KAIJU_BIN:$PATH
# Set kaiju-related environment variables.
source $KAIJU_INSTALL_DIR/scripts/setupEnvironment.sh
# Add the kaiju scripts to the PATH.
export KAIJU_SCRIPTS_DIR=$KAIJUHOME/scripts
export PATH=$KAIJU_SCRIPTS_DIR:$PATH
export PATH=$KAIJU_SCRIPTS_DIR/datamodel:$PATH
export PATH=$KAIJU_SCRIPTS_DIR/helio:$PATH
export PATH=$KAIJU_SCRIPTS_DIR/legacy:$PATH
export PATH=$KAIJU_SCRIPTS_DIR/postproc:$PATH
export PATH=$KAIJU_SCRIPTS_DIR/preproc:$PATH
export PATH=$KAIJU_SCRIPTS_DIR/quicklook:$PATH
# Add the kaiju quickstart code to the PATH.
# Add the kaiju quickstart code for this model to the PATH.
export KAIJU_QUICKSTART_DIR=$KAIJUHOME/quickstart
export PATH=$KAIJU_QUICKSTART_DIR/loop2d:$PATH
export PATH=$KAIJU_QUICKSTART_DIR/bw3d:$PATH
export PATH=$KAIJU_QUICKSTART_DIR/geo_serial:$PATH
# Add the kaipy directory to the python module path.
export PYTHONPATH=$KAIJUHOME:$PYTHONPATH
# Add the geopack directory to the python module path.
export PYTHONPATH=$KAIJUHOME/external/geopack-2008/build/lib.linux-x86_64-3.9:$PYTHONPATH
#export PYTHONPATH=$KAIJUHOME/external/geopack-2008/build/lib.linux-x86_64-3.9:$PYTHONPATH
# Set the OMP stack size to prevent a crash.
# If this setting is ignored, the loop2d model will cause gamera.x to crash