Skip to content
Snippets Groups Projects
Commit 8173886d authored by Clement Rousset's avatar Clement Rousset
Browse files

Merge branch '223-more-debugging-in-4-2' into 'branch_4.2'

Resolve "more debugging in 4.2"

See merge request nemo/nemo!271
parents 1e796e72 b5418c4e
No related branches found
No related tags found
No related merge requests found
...@@ -268,16 +268,6 @@ CONTAINS ...@@ -268,16 +268,6 @@ CONTAINS
! !== allocate runoff arrays ! !== allocate runoff arrays
IF( sbc_rnf_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_rnf_alloc : unable to allocate arrays' ) IF( sbc_rnf_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_rnf_alloc : unable to allocate arrays' )
! !
IF( .NOT. ln_rnf ) THEN ! no specific treatment in vicinity of river mouths
ln_rnf_mouth = .FALSE. ! default definition needed for example by sbc_ssr or by tra_adv_muscl
nkrnf = 0
rnf (:,:) = 0.0_wp
rnf_b (:,:) = 0.0_wp
rnfmsk (:,:) = 0.0_wp
rnfmsk_z(:) = 0.0_wp
RETURN
ENDIF
!
! ! ============ ! ! ============
! ! Namelist ! ! Namelist
! ! ============ ! ! ============
...@@ -289,6 +279,19 @@ CONTAINS ...@@ -289,6 +279,19 @@ CONTAINS
902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namsbc_rnf in configuration namelist' ) 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namsbc_rnf in configuration namelist' )
IF(lwm) WRITE ( numond, namsbc_rnf ) IF(lwm) WRITE ( numond, namsbc_rnf )
! !
IF( .NOT. ln_rnf ) THEN ! no specific treatment in vicinity of river mouths
ln_rnf_mouth = .FALSE. ! default definition needed for example by sbc_ssr or by tra_adv_muscl
ln_rnf_tem = .FALSE.
ln_rnf_sal = .FALSE.
ln_rnf_icb = .FALSE.
nkrnf = 0
rnf (:,:) = 0.0_wp
rnf_b (:,:) = 0.0_wp
rnfmsk (:,:) = 0.0_wp
rnfmsk_z(:) = 0.0_wp
RETURN
ENDIF
!
! ! Control print ! ! Control print
IF(lwp) THEN IF(lwp) THEN
WRITE(numout,*) WRITE(numout,*)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment