File tree 2 files changed +12
-9
lines changed
2 files changed +12
-9
lines changed Original file line number Diff line number Diff line change @@ -13,10 +13,11 @@ project(
13
13
14
14
get_directory_property (hasParent PARENT_DIRECTORY )
15
15
if (hasParent)
16
- # Unset flags that come from UFS because they (-r8/-r4) conflict
17
- # with Ww3
16
+ # Unset flags that come from Parent (ie UFS or other coupled build)
17
+ # for potential (-r8/-r4) conflict
18
18
set (CMAKE_Fortran_FLAGS "" )
19
19
set (CMAKE_C_FLAGS "" )
20
+ remove_definitions (-DDEBUG)
20
21
endif ()
21
22
22
23
set (MULTI_ESMF OFF CACHE BOOL "Build ww3_multi_esmf library" )
Original file line number Diff line number Diff line change 367
367
368
368
mkdir -p $path_w
369
369
370
+ cd $path_w
371
+
372
+ if [ $stub ] && [ -f finished ]
373
+ then
374
+ echo " Test already finished, skipping ..."
375
+ echo ' '
376
+ exit 0
377
+ fi
378
+
370
379
if [ $multi -eq 0 ] && [ $coupl = " OASIS" ]
371
380
then
372
381
ww3_dir=${path_s} /..
@@ -547,13 +556,6 @@ echo " Input directory: $path_i"
547
556
echo " Switch file: $file_c "
548
557
echo ' '
549
558
550
- if [ $stub ] && [ -f finished ]
551
- then
552
- echo " Test already finished, skipping ..."
553
- echo ' '
554
- exit 0
555
- fi
556
-
557
559
# 3.b2 Preprocess cdl files into nc files ----------------------------------- #
558
560
559
561
for f in $( find $path_i / -type f -name " *.cdl" )
You can’t perform that action at this time.
0 commit comments