Changeset 13388


Ignore:
Timestamp:
2020-08-06T17:05:16+02:00 (3 months 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:
2 edited

Legend:

Unmodified
Added
Removed
  • NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90

    r13102 r13388  
    143143 
    144144      IF ( MINVAL(rivers%river_area) <= 0 ) THEN 
    145          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 
     145         WRITE(numout,*) 'ERROR: There is at least one river with a river outflow area of zero. Please check your file_riv_number file' 
     146         WRITE(numout,*) 'that all the allocated river numbers are at ocean points as defined by the bathymetry file with no river' 
     147         WRITE(numout,*) 'numbers within the north fold or wraparound points.' 
     148         CALL ctl_stop ( 'STOP', 'ERROR: There is at least one river with a river outflow area of zero. See stdout.') 
    146149      END IF 
    147150       
  • NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/sbccpl.F90

    r12849 r13388  
    119119   INTEGER, PARAMETER ::   jpr_grnm   = 58   ! Greenland ice mass  
    120120   INTEGER, PARAMETER ::   jpr_antm   = 59   ! Antarctic ice mass  
    121    INTEGER, PARAMETER ::   jpr_rnf_1d = 60            ! 1D river runoff  
    122  
    123    INTEGER, PARAMETER ::   jprcv      = 60   ! total number of fields received   
     121   INTEGER, PARAMETER ::   jpr_rnf_1d = 60   ! 1D river runoff  
     122   INTEGER, PARAMETER ::   jpr_qtr    = 61   ! Transmitted solar 
     123 
     124   INTEGER, PARAMETER ::   jprcv      = 61   ! total number of fields received 
    124125 
    125126   INTEGER, PARAMETER ::   jps_fice   =  1   ! ice fraction sent to the atmosphere 
Note: See TracChangeset for help on using the changeset viewer.