Skip to content

Cmake run_test and debug fixes #647

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
aliabdolali merged 3 commits into from
Mar 24, 2022
Merged

Cmake run_test and debug fixes #647

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93c7373
update for debug, fix provided by Kyle
JessicaMeixner-NOAA Mar 23, 2022
1da492b
update for exiting before build if test is already finished with -S o…
JessicaMeixner-NOAA Mar 24, 2022
9efd815
Merge remote-tracking branch 'EMC/develop' into bug/cmakeruntest
JessicaMeixner-NOAA Mar 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@ project(

get_directory_property(hasParent PARENT_DIRECTORY)
if(hasParent)
# Unset flags that come from UFS because they (-r8/-r4) conflict
# with Ww3
# Unset flags that come from Parent (ie UFS or other coupled build)
# for potential (-r8/-r4) conflict
set(CMAKE_Fortran_FLAGS "")
set(CMAKE_C_FLAGS "")
remove_definitions(-DDEBUG)
endif()

set(MULTI_ESMF OFF CACHE BOOL "Build ww3_multi_esmf library")
Expand Down
16 changes: 9 additions & 7 deletions regtests/bin/run_cmake_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,15 @@ fi

mkdir -p $path_w

cd $path_w

if [ $stub ] && [ -f finished ]
then
echo " Test already finished, skipping ..."
echo ' '
exit 0
fi

if [ $multi -eq 0 ] && [ $coupl = "OASIS" ]
then
ww3_dir=${path_s}/..
Expand Down Expand Up @@ -547,13 +556,6 @@ echo " Input directory: $path_i"
echo " Switch file: $file_c"
echo ' '

if [ $stub ] && [ -f finished ]
then
echo " Test already finished, skipping ..."
echo ' '
exit 0
fi

# 3.b2 Preprocess cdl files into nc files ----------------------------------- #

for f in $(find $path_i/ -type f -name "*.cdl")
Expand Down