Skip to content

Minor fixes for PR #5 #6

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
alperaltuntas merged 1 commit into from
Nov 19, 2022
Merged

Minor fixes for PR #5 #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions model/src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 0 additions & 9 deletions model/src/w3sic4md.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
!/
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down