Changeset 13712

Timestamp:

2020-11-02T13:07:13+01:00 (3 years ago)

Author:

dancopsey

Message:

Use tmask to ignore North Fold. Improve error messages.

Location:

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC

Files:

• cpl_oasis3.F90 (modified) (1 diff)
• cpl_rnf_1d.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_oasis3.F90

@@ -81 +81 @@
    INTEGER                    ::   nsnd         ! total number of fields sent 
    INTEGER                    ::   ncplmodel    ! Maximum number of models to/from which NEMO is potentialy sending/receiving data
-   INTEGER, PUBLIC, PARAMETER ::   nmaxfld=60   ! Maximum number of coupling fields
+   INTEGER, PUBLIC, PARAMETER ::   nmaxfld=61   ! Maximum number of coupling fields
    INTEGER, PUBLIC, PARAMETER ::   nmaxcat=5    ! Maximum number of coupling fields
    INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90

@@ -57 +57 @@
       INTEGER                                   ::   ios                 ! Local integer output status for namelist read
       INTEGER                                   ::   inum
-      INTEGER                                   ::   ii, jj              !: Loop indices
+      INTEGER                                   ::   ii, jj, rr          !: Loop indices
       INTEGER                                   ::   max_river
       REAL(wp), DIMENSION(jpi,jpj)              ::   river_number        ! 2D array containing the river outflow numbers
@@ -139 +139 @@
         WRITE(numout,*) 'Maximum river area = ',MAXVAL(rivers%river_area)
         WRITE(numout,*) 'Minimum river area = ',MINVAL(rivers%river_area)
+        WRITE(numout,*) 'Sum of river areas = ',SUM(rivers%river_area)
         CALL flush(numout)
       END IF
@@ -146 +147 @@
          WRITE(numout,*) 'that all the allocated river numbers are at ocean points as defined by the bathymetry file with no river'
          WRITE(numout,*) 'numbers within the north fold or wraparound points.'
-         CALL ctl_stop ( 'STOP', 'ERROR: There is at least one river with a river outflow area of zero. See stdout.')
+         DO rr = 1,nn_cpl_river
+           IF ( rivers%river_area(rr) <= 0 ) THEN
+             WRITE(numout,*) 'The first river with this problem is river number ',rr
+             CALL ctl_stop ( 'STOP', 'ERROR: There is at least one river with a river outflow area of zero. See stdout.')
+           END IF
+         END DO
       END IF
       
@@ -164 +170 @@
       REAL                   , INTENT(in   ) ::   runoff_1d(nn_cpl_river)    ! River runoff. One value per river.
       
-      INTEGER  ::   ii, jj                 ! Loop indices
+      INTEGER  ::   ii, jj, rr                 ! Loop indices
+      LOGICAL  ::   found_nan
             
       ! Convert the 1D total runoff per river to 2D runoff flux by
@@ -170 +177 @@
       DO ii = 1, jpi
         DO jj = 1, jpj
-          IF ( rivers%river_number(ii,jj) > 0 .AND. rivers%river_number(ii,jj) <= nn_cpl_river ) THEN
+          IF ( rivers%river_number(ii,jj) > 0 .AND. rivers%river_number(ii,jj) <= nn_cpl_river .AND. tmask_i(ii,jj) > 0.5 ) THEN
             rnf(ii,jj) = runoff_1d(rivers%river_number(ii,jj)) / rivers%river_area(rivers%river_number(ii,jj))
           ELSE
@@ -179 +186 @@
       END DO
 
+      IF ( ln_print_river_info ) THEN
+        WRITE(numout,*) 'SUM of river runoff on 1D array = ',SUM(runoff_1d)
+        WRITE(numout,*) 'SUM of river runoff on 2D array = ',SUM(rnf)
+        found_nan = .false.
+        DO rr = 1, nn_cpl_river
+          IF (runoff_1d(rr) /= runoff_1d(rr)) THEN
+            IF (.NOT. found_nan) THEN
+              WRITE(numout,*) 'WARNING: NAN found at river number ',rr
+              found_nan = .true.
+            END IF
+          END IF
+        END DO
+      END IF     
+
+
    END SUBROUTINE cpl_rnf_1d_to_2d