From eb0321cb77235ce2b0aa042f6b1544135f019137 Mon Sep 17 00:00:00 2001
From: KyleKlenk <kyle.c.klenk@gmail.com>
Date: Mon, 15 Jan 2024 15:40:57 -0600
Subject: [PATCH] Add OpenBLAS package for Cluster build type
---
build/CMakeLists.txt | 2 +-
build/source/actors/job_actor/job_actor.f90 | 10 ++++++----
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/build/CMakeLists.txt b/build/CMakeLists.txt
index 33b9bc1..49f844f 100644
--- a/build/CMakeLists.txt
+++ b/build/CMakeLists.txt
@@ -26,13 +26,13 @@ else()
set(FLAGS_CXX -O3 -Wfatal-errors -std=c++17 ${FLAGS_OPT})
endif()
-# find_package(OpenBLAS REQUIRED)
find_package(CAF COMPONENTS core io REQUIRED)
set(CAF_INCLUDES ${CAF_INCLUDE_DIRS})
set(CAF_LIBRARIES CAF::core CAF::io)
set(EXEC_NAME summa_be)
if (CMAKE_BUILD_TYPE MATCHES Cluster)
+ find_package(OpenBLAS REQUIRED)
# Set include directories
set(INCLUDES $ENV{EBROOTNETCDFMINFORTRAN}/include ${netCDF_INCLUDES} ${OpenBLAS_INCLUDES})
set(LIBRARIES SUMMA_NOAHMP ${OpenBLAS_LIBRARIES} -lnetcdff)
diff --git a/build/source/actors/job_actor/job_actor.f90 b/build/source/actors/job_actor/job_actor.f90
index 10eb1d1..4d5f099 100644
--- a/build/source/actors/job_actor/job_actor.f90
+++ b/build/source/actors/job_actor/job_actor.f90
@@ -91,11 +91,13 @@ subroutine job_init_fortran(file_manager, start_gru, num_gru,&
end select
if(err/=0)then; print*, trim(message); return; endif
- ! *****************************************************************************
+ ! ****************************************************************************
! *** define the suffix for the model output file
- ! *****************************************************************************
- ! set up the output file names as: OUTPUT_PREFIX'_'output_fileSuffix'_'startGRU-endGRU_outfreq.nc or OUTPUT_PREFIX'_'output_fileSuffix'_'HRU_outfreq.nc;
- if (output_fileSuffix(1:1) /= '_') output_fileSuffix='_'//trim(output_fileSuffix) ! separate output_fileSuffix from others by underscores
+ ! *** OUTPUT_PREFIX'_'output_fileSuffix'_'startGRU-endGRU_outfreq.nc or
+ ! *** OUTPUT_PREFIX'_'output_fileSuffix'_'HRU_outfreq.nc
+ ! ****************************************************************************
+ output_fileSuffix = ''
+ if (output_fileSuffix(1:1) /= '_') output_fileSuffix='_'//trim(output_fileSuffix)
if (output_fileSuffix(len_trim(output_fileSuffix):len_trim(output_fileSuffix)) == '_') output_fileSuffix(len_trim(output_fileSuffix):len_trim(output_fileSuffix)) = ' '
select case (iRunMode)
case(iRunModeGRU)
--
GitLab