Skip to content
Snippets Groups Projects
Commit 4669aceb authored by Sebastien Masson's avatar Sebastien Masson
Browse files

Merge branch '33-bug-in-sbcrnf-f90' into 'branch_4.2'

Merge branch '29-zdftke-and-zdfgls-nn_ice-0' into 'branch_4.2'

See merge request nemo/nemo!58
parents 5b0ed647 e416ea5d
No related branches found
No related tags found
No related merge requests found
...@@ -855,6 +855,7 @@ CONTAINS ...@@ -855,6 +855,7 @@ CONTAINS
IF(lwp) THEN IF(lwp) THEN
WRITE(numout,*) WRITE(numout,*)
WRITE(numout,*) ' -----------------------------------------------------------' WRITE(numout,*) ' -----------------------------------------------------------'
CALL FLUSH(numout)
ENDIF ENDIF
CALL mppsync CALL mppsync
CALL mppstop( ld_abort = .TRUE. ) CALL mppstop( ld_abort = .TRUE. )
......
...@@ -362,9 +362,9 @@ CONTAINS ...@@ -362,9 +362,9 @@ CONTAINS
IF( .NOT. sn_dep_rnf%ln_clim ) THEN ; WRITE(rn_dep_file, '(a,"_y",i4)' ) TRIM( rn_dep_file ), nyear ! add year IF( .NOT. sn_dep_rnf%ln_clim ) THEN ; WRITE(rn_dep_file, '(a,"_y",i4)' ) TRIM( rn_dep_file ), nyear ! add year
IF( sn_dep_rnf%clftyp == 'monthly' ) WRITE(rn_dep_file, '(a,"m",i2)' ) TRIM( rn_dep_file ), nmonth ! add month IF( sn_dep_rnf%clftyp == 'monthly' ) WRITE(rn_dep_file, '(a,"m",i2)' ) TRIM( rn_dep_file ), nmonth ! add month
ENDIF ENDIF
CALL iom_open ( rn_dep_file, inum ) ! open file CALL iom_open ( rn_dep_file, inum ) ! open file
CALL iom_get ( inum, jpdom_global, sn_dep_rnf%clvar, h_rnf ) ! read the river mouth array CALL iom_get ( inum, jpdom_global, sn_dep_rnf%clvar, h_rnf, kfill = jpfillcopy ) ! read the river mouth. no 0 on halos!
CALL iom_close( inum ) ! close file CALL iom_close( inum ) ! close file
! !
nk_rnf(:,:) = 0 ! set the number of level over which river runoffs are applied nk_rnf(:,:) = 0 ! set the number of level over which river runoffs are applied
DO_2D( nn_hls, nn_hls, nn_hls, nn_hls ) DO_2D( nn_hls, nn_hls, nn_hls, nn_hls )
......
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