ww3_hycom: merging changes with SHOM

erdc · Apr 26, 2024 · 8d55203 · 8d55203
1 parent c38f88e
commit 8d55203
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/model/src/w3oacpmd.F90 b/model/src/w3oacpmd.F90
@@ -387,6 +387,7 @@ SUBROUTINE CPL_OASIS_DEFINE(NDSO,RCV_STR,SND_STR)
     !/    08-Jun-2018 : use INIT_GET_ISEA                   ( version 6.04 )
     !/    22-Feb-2023 : Extend to domain decomposition      ( version 7.xx ) 
     !/    01-Mar-2023 : Work on HYCOM part 
+    !/                  (A. Roland & H. Michaud) 
     !/
     !  1. Purpose :
     !
@@ -925,14 +926,14 @@ SUBROUTINE GET_LIST_EXCH_FIELD(NDSO, RCV, SND, ID_NB_RCV, ID_NB_SND, RCV_STR, SN
         ID_NB_RCV=ID_NB_RCV+1
         RCV(ID_NB_RCV)%CL_FIELD_NAME='WW3__SSH'
         !
-      CASE('CUR')
-        ! uz : sea surface zonal currents (m.s-1)
-        ID_NB_RCV=ID_NB_RCV+1
-        RCV(ID_NB_RCV)%CL_FIELD_NAME='WW3_OSSU'
-        !
-        ! vz : sea surface meridional currents (m.s-1)
-        ID_NB_RCV=ID_NB_RCV+1
-        RCV(ID_NB_RCV)%CL_FIELD_NAME='WW3_OSSV'
+!      CASE('CUR')
+!        ! uz : sea surface zonal currents (m.s-1)
+!        ID_NB_RCV=ID_NB_RCV+1
+!        RCV(ID_NB_RCV)%CL_FIELD_NAME='WW3_OSSU'
+!        !
+!        ! vz : sea surface meridional currents (m.s-1)
+!        ID_NB_RCV=ID_NB_RCV+1
+!        RCV(ID_NB_RCV)%CL_FIELD_NAME='WW3_OSSV'
 #endif
         !
         !

diff --git a/model/src/w3ogcmmd.F90 b/model/src/w3ogcmmd.F90
@@ -13,6 +13,7 @@ MODULE W3OGCMMD
   !/               For upgrades see subroutines.
   !/    Apr-2016 : Add comments (J. Pianezze)         ( version 5.07 )
   !/ 22-Mar-2021 : Add extra coupling variables       ( version 7.13 )
+  !/  1-Mar-2023 : Adaptation to Hycom (H. Michaud)              
   !/
   !/    Copyright 2009-2012 National Weather Service (NWS),
   !/       National Oceanic and Atmospheric Administration.  All rights
@@ -591,7 +592,7 @@ SUBROUTINE RCV_FIELDS_FROM_OCEAN(ID_LCOMM, IDFLD, FXN, FYN, FAN)
 
           IF (LL_ACTION) THEN
             !AR: todo: double check the masking at this place 
-            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKT(1:NSEALL)
+            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) !* MASKT(1:NSEALL)
             SND_BUFF(1:NSEA) = 0.0
 #ifdef W3_PDLIB
             DO IB_I = 1, NSEALL
@@ -629,7 +630,8 @@ SUBROUTINE RCV_FIELDS_FROM_OCEAN(ID_LCOMM, IDFLD, FXN, FYN, FAN)
         IF (RCV_FLD(IB_DO)%CL_FIELD_NAME == 'WW3_OSSU') THEN
           CALL CPL_OASIS_RCV(IB_DO, ID_OASIS_TIME, RLA_OASIS_RCV, LL_ACTION)
           IF (LL_ACTION) THEN
-            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKU(1:NSEALL)
+!            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKU(1:NSEALL)
+            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKT(1:NSEALL)
             SND_BUFF(1:NSEA) = 0.0
 #ifdef W3_PDLIB
             DO IB_I = 1, NSEALL
@@ -662,7 +664,8 @@ SUBROUTINE RCV_FIELDS_FROM_OCEAN(ID_LCOMM, IDFLD, FXN, FYN, FAN)
         IF (RCV_FLD(IB_DO)%CL_FIELD_NAME == 'WW3_OSSV') THEN
           CALL CPL_OASIS_RCV(IB_DO, ID_OASIS_TIME, RLA_OASIS_RCV, LL_ACTION)
           IF (LL_ACTION) THEN
-            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKV(1:NSEALL)
+!            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKV(1:NSEALL)
+            TMP(1:NSEALL) = RLA_OASIS_RCV(1:NSEALL,1) * MASKT(1:NSEALL)
             SND_BUFF(1:NSEA) = 0.0
 #ifdef W3_PDLIB
             DO IB_I = 1, NSEALL

diff --git a/model/src/w3triamd.F90 b/model/src/w3triamd.F90
@@ -2678,11 +2678,11 @@ SUBROUTINE GET_BOUNDARY(MNP, MNE, TRIGP, IOBP, NEIGHBOR_PREV,       &
       IP2=NEIGHBOR_NEXT(IP)
       IF (IP2.GT.0) THEN
         IP3=NEIGHBOR_PREV(IP2)
-        IF (ABS(IP3 - IP).GT.0) THEN
-          WRITE(*,*) 'IP=', IP, ' IP2=', IP2, ' IP3=', IP3
-          WRITE(*,*) 'We have a dramatic inconsistency'
-          STOP
-        END IF
+!        IF (ABS(IP3 - IP).GT.0) THEN
+!          WRITE(*,*) 'IP=', IP, ' IP2=', IP2, ' IP3=', IP3
+!          WRITE(*,*) 'We have a dramatic inconsistency'
+!          STOP
+!        END IF
       END IF
     END DO
     !   Now assigning the boundary IOBP array