Changeset 13388 for NEMO

Timestamp:

2020-08-06T17:05:16+02:00 (4 years ago)

Author:

dancopsey

Message:

Fix conflicts with penetrating solar branch

Location:

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

Files:

• cpl_rnf_1d.F90 (modified) (1 diff)
• sbccpl.F90 (modified) (1 diff)

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

@@ -143 +143 @@
 
       IF ( MINVAL(rivers%river_area) <= 0 ) THEN
-         CALL oasis_abort ( ncomp_id, 'cpl_rnf_1d_init', 'There is at least one river with a river outflow area of zero. Please check your file_riv_number file that all the allocated river numbers are at ocean points as defined by the bathymetry file.')   ;   RETURN
+         WRITE(numout,*) 'ERROR: There is at least one river with a river outflow area of zero. Please check your file_riv_number file'
+         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.')
       END IF
       

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

@@ -119 +119 @@
    INTEGER, PARAMETER ::   jpr_grnm   = 58   ! Greenland ice mass 
    INTEGER, PARAMETER ::   jpr_antm   = 59   ! Antarctic ice mass 
-   INTEGER, PARAMETER ::   jpr_rnf_1d = 60            ! 1D river runoff 
-
-   INTEGER, PARAMETER ::   jprcv      = 60   ! total number of fields received  
+   INTEGER, PARAMETER ::   jpr_rnf_1d = 60   ! 1D river runoff 
+   INTEGER, PARAMETER ::   jpr_qtr    = 61   ! Transmitted solar
+
+   INTEGER, PARAMETER ::   jprcv      = 61   ! total number of fields received
 
    INTEGER, PARAMETER ::   jps_fice   =  1   ! ice fraction sent to the atmosphere