From 261844ddf3f16a6d0f75264ba6d94eaa8c1ce9f9 Mon Sep 17 00:00:00 2001 From: alperaltuntas Date: Fri, 18 Nov 2022 17:17:42 -0700 Subject: [PATCH] fixes for PR #5 --- model/src/CMakeLists.txt | 6 ++++++ model/src/w3sic4md.F90 | 9 --------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/model/src/CMakeLists.txt b/model/src/CMakeLists.txt index 209e5b567..477006749 100644 --- a/model/src/CMakeLists.txt +++ b/model/src/CMakeLists.txt @@ -76,6 +76,12 @@ add_compile_definitions(W3_IS0) add_compile_definitions(W3_REF0) add_compile_definitions(ENDIANNESS="big_endian") +set_property(SOURCE w3initmd.F90 + APPEND + PROPERTY COMPILE_DEFINITIONS + "__WW3_SWITCHES__=\'\'" + ) + # Note that w3iogocdmd is a new file for netcdf io # Set source files set(SRCFILES constants.F90 diff --git a/model/src/w3sic4md.F90 b/model/src/w3sic4md.F90 index 74e7a251c..632d71fa3 100644 --- a/model/src/w3sic4md.F90 +++ b/model/src/w3sic4md.F90 @@ -292,9 +292,6 @@ SUBROUTINE W3SIC4 (A, DEPTH, CG, IX, IY, S, D) #ifdef W3_T1 USE W3ARRYMD, ONLY: OUTMAT #endif -#ifdef W3_CESMCOUPLED - USE W3IDATMD, ONLY: ICEI -#endif ! IMPLICIT NONE !/ @@ -354,9 +351,6 @@ SUBROUTINE W3SIC4 (A, DEPTH, CG, IX, IY, S, D) KARG2 = 0.0 KARG3 = 0.0 WN_I = 0.0 -#ifdef W3_CESMCOUPLED - iceconc = 0.0 -#endif ALPHA = 0.0 ICECOEF1 = 0.0 ICECOEF2 = 0.0 @@ -385,9 +379,6 @@ SUBROUTINE W3SIC4 (A, DEPTH, CG, IX, IY, S, D) IF (INFLAGS2(-5)) ICECOEF3 = ICEP3(IX,IY) IF (INFLAGS2(-4)) ICECOEF4 = ICEP4(IX,IY) IF (INFLAGS2(-3)) ICECOEF5 = ICEP5(IX,IY) -#ifdef W3_CESMCOUPLED - IF (INFLAGS2(4)) iceconc = ICEI(IX,IY) -#endif ! Borrow from Smud (error if BT8 or BT9) #ifdef W3_BT8