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

Timestamp:

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

Author:

dancopsey

Message:

Fix conflicts with penetrating solar branch

File:

• NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90 (modified) (1 diff)

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