ecWAM: more minor fixes for NEMO SP builds

ecmwf-ifs · Feb 29, 2024 · 0f10347 · 0f10347
1 parent d8e561f
commit 0f10347
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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