- Timestamp:
- 2019-11-27T10:53:17+01:00 (5 years ago)
- Location:
- NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/DYN/dynspg_ts.F90
r11970 r11973 336 336 ! ! --------------------------------------------------- ! 337 337 IF (ln_bt_fw) THEN ! FORWARD integration: use kt+1/2 fluxes (NOW+1/2) 338 zssh_frc(:,:) = r1_rau0 * ( emp(:,:) - rnf(:,:) + fwfisf(:,:) )338 zssh_frc(:,:) = r1_rau0 * ( emp(:,:) - rnf(:,:) + fwfisf_cav(:,:) + fwfisf_par(:,:) ) 339 339 ELSE ! CENTRED integration: use kt-1/2 + kt+1/2 fluxes (NOW) 340 340 zztmp = r1_rau0 * r1_2 -
NEMO/branches/2019/ENHANCE-02_ISF_nemo_TEST_MERGE/src/OCE/ISF/isfstp.F90
r11931 r11973 284 284 REWIND( numnam_ref ) ! Namelist namsbc_rnf in reference namelist : Runoffs 285 285 READ ( numnam_ref, namisf, IOSTAT = ios, ERR = 901) 286 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namisf in reference namelist' , lwp)286 901 IF( ios /= 0 ) CALL ctl_nam ( ios , 'namisf in reference namelist' ) 287 287 ! 288 288 REWIND( numnam_cfg ) ! Namelist namsbc_rnf in configuration namelist : Runoffs 289 289 READ ( numnam_cfg, namisf, IOSTAT = ios, ERR = 902 ) 290 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namisf in configuration namelist' , lwp)290 902 IF( ios > 0 ) CALL ctl_nam ( ios , 'namisf in configuration namelist' ) 291 291 IF(lwm) WRITE ( numond, namisf ) 292 292
Note: See TracChangeset
for help on using the changeset viewer.