From 0f10347ab5f2920b6b5f385f00f43742c1c2ee11 Mon Sep 17 00:00:00 2001 From: Ahmad Nawab Date: Thu, 29 Feb 2024 13:53:56 +0000 Subject: [PATCH] ecWAM: more minor fixes for NEMO SP builds --- src/ecwam/getcurr.F90 | 4 ++-- src/ecwam/recvnemofields.F90 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/ecwam/getcurr.F90 b/src/ecwam/getcurr.F90 index 9bedcd3b7..e4fbecc57 100644 --- a/src/ecwam/getcurr.F90 +++ b/src/ecwam/getcurr.F90 @@ -158,8 +158,8 @@ SUBROUTINE GETCURR(LWCUR, IREAD, BLK2LOC, & JY = BLK2LOC%JFROMIJ(IJ,ICHNK) IF (FIELDG%LKFR(IX,JY) <= 0.0_JWRB ) THEN ! if lake cover = 0, we assume open ocean point, then get currents directly from NEMO - WVENVI%UCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOUCUR(IJ,ICHNK)),CURRENT_MAX),NEMO2WAM%NEMOUCUR(IJ,ICHNK)) - WVENVI%VCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOVCUR(IJ,ICHNK)),CURRENT_MAX),NEMO2WAM%NEMOVCUR(IJ,ICHNK)) + WVENVI%UCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOUCUR(IJ,ICHNK)),REAL(CURRENT_MAX,JWRO)),NEMO2WAM%NEMOUCUR(IJ,ICHNK)) + WVENVI%VCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOVCUR(IJ,ICHNK)),REAL(CURRENT_MAX,JWRO)),NEMO2WAM%NEMOVCUR(IJ,ICHNK)) ELSE ! no currents over lakes and land WVENVI%UCUR(IJ,ICHNK) = 0.0_JWRB diff --git a/src/ecwam/recvnemofields.F90 b/src/ecwam/recvnemofields.F90 index 7eaa4b0a2..c804fa5ad 100644 --- a/src/ecwam/recvnemofields.F90 +++ b/src/ecwam/recvnemofields.F90 @@ -198,8 +198,8 @@ SUBROUTINE RECVNEMOFIELDS(BLK2LOC, WVENVI, NEMO2WAM, & JY = BLK2LOC%JFROMIJ(IJ,ICHNK) ! if lake cover = 0, we assume open ocean point, then get currents directly from NEMO IF (FIELDG%LKFR(IX,JY) <= 0.0_JWRB ) THEN - WVENVI%UCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOUCUR(IJ,ICHNK)),CURRENT_MAX),NEMO2WAM%NEMOUCUR(IJ,ICHNK)) - WVENVI%VCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOVCUR(IJ,ICHNK)),CURRENT_MAX),NEMO2WAM%NEMOVCUR(IJ,ICHNK)) + WVENVI%UCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOUCUR(IJ,ICHNK)),REAL(CURRENT_MAX,JWRO)),NEMO2WAM%NEMOUCUR(IJ,ICHNK)) + WVENVI%VCUR(IJ,ICHNK) = SIGN(MIN(ABS(NEMO2WAM%NEMOVCUR(IJ,ICHNK)),REAL(CURRENT_MAX,JWRO)),NEMO2WAM%NEMOVCUR(IJ,ICHNK)) ELSE WVENVI%UCUR(IJ,ICHNK)=0.0_JWRB WVENVI%VCUR(IJ,ICHNK)=0.0_JWRB