diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 2ca3eb157ebcc418fffa44486efb449d25233d8b..f4e5c70288050c2126044d60c1a523471233a14b 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,7 +2,6 @@
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="" vcs="Git" />
- <mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/inmcm60_sfx-src" vcs="Git" />
<mapping directory="$PROJECT_DIR$/cmake-build-debug/_deps/sfxlib-src" vcs="Git" />
</component>
</project>
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7bb59ddd40218ecbe6d8befe9112f1d1e361c293..c20a8a48a1e59aaabf2938429311c3c98950d7c3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -58,15 +58,6 @@ if ("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
endif()
endif()
-if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
- target_compile_options(abl_lib
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -traceback -check all -ftrapuv -debug all >)
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- target_compile_options(abl_lib
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -fbacktrace -ffpe-trap=zero,overflow,underflow >)
- endif()
-endif()
if (WITH_TESTS)
# RRTMG option
@@ -90,34 +81,36 @@ if (WITH_TESTS)
if (WITH_RRTMG)
list(APPEND test_files src/rrtm_interface.f90)
endif()
- #gabls1 experiment
- add_executable(gabls1 src/tests/gabls1.f90
+ #make a utils library
+ set(abl_utils_files
src/config-utils.f90
src/scm_io_default.f90
src/scm_sfx_data.f90)
+
+ add_library(abl_utils ${abl_utils_files})
+ target_link_libraries(abl_utils PRIVATE sfx_lib)
+ #gabls1 experiment
+ add_executable(gabls1 src/tests/gabls1.f90)
target_include_directories(gabls1 PUBLIC ${CMAKE_BINARY_DIR}/modules/)
target_link_libraries( gabls1 PRIVATE abl_lib )
target_link_libraries(gabls1 PRIVATE sfx_lib)
+ target_link_libraries(gabls1 PRIVATE abl_utils)
target_link_libraries(gabls1 PRIVATE config_parser_F config_parser_CXX)
#gabls2 experiment
- add_executable(gabls2 src/tests/gabls2.f90
- src/config-utils.f90
- src/scm_io_default.f90
- src/scm_sfx_data.f90)
+ add_executable(gabls2 src/tests/gabls2.f90)
target_include_directories(gabls2 PUBLIC ${CMAKE_BINARY_DIR}/modules/)
target_link_libraries( gabls2 PRIVATE abl_lib )
target_link_libraries(gabls2 PRIVATE sfx_lib)
+ target_link_libraries(gabls2 PRIVATE abl_utils)
target_link_libraries(gabls2 PRIVATE config_parser_F config_parser_CXX)
#cbl experiment
- add_executable(cbl_exp src/tests/cbl_exp.f90
- src/config-utils.f90
- src/scm_io_default.f90
- src/scm_sfx_data.f90)
+ add_executable(cbl_exp src/tests/cbl_exp.f90)
target_include_directories(cbl_exp PUBLIC ${CMAKE_BINARY_DIR}/modules/)
target_link_libraries( cbl_exp PRIVATE abl_lib )
target_link_libraries(cbl_exp PRIVATE sfx_lib)
+ target_link_libraries(cbl_exp PRIVATE abl_utils)
target_link_libraries(cbl_exp PRIVATE config_parser_F config_parser_CXX)
if(WITH_RRTMG)
target_link_libraries(gabls1 PRIVATE rrtm)
@@ -148,23 +141,6 @@ if (WITH_TESTS)
endif()
endif()
- if ("${CMAKE_BUILD_TYPE}" STREQUAL "Release")
- if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Intel")
- target_compile_options(gabls1
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -traceback -check all -ftrapuv -debug all >)
- target_compile_options(gabls2
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -traceback -check all -ftrapuv -debug all >)
- target_compile_options(cbl_exp
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -traceback -check all -ftrapuv -debug all >)
- elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU")
- target_compile_options(gabls1
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -fbacktrace -ffpe-trap=zero,overflow,underflow >)
- target_compile_options(gabls2
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -fbacktrace -ffpe-trap=zero,overflow,underflow >)
- target_compile_options(cbl_exp
- PUBLIC $<$<COMPILE_LANGUAGE:Fortran>: -g -fbacktrace -ffpe-trap=zero,overflow,underflow >)
- endif()
- endif()
endif(WITH_TESTS)