- Timestamp:
- 2019-11-22T15:29:17+01:00 (4 years ago)
- Location:
- NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src
- Property svn:mergeinfo deleted
-
NEMO/branches/2019/dev_r11943_MERGE_2019/src/OCE/DIU/step_diu.F90
r10069 r11949 6 6 !! History : 3.7 ! 2015-11 (J. While) Original code 7 7 8 USE diurnal_bulk ! diurnal SST bulk routines (diurnal_sst_takaya routine) 9 USE cool_skin ! diurnal cool skin correction (diurnal_sst_coolskin routine) 8 USE diu_layers ! diurnal SST bulk and coolskin routines 10 9 USE iom 11 10 USE sbc_oce … … 49 48 INTEGER :: indic ! error indicator if < 0 50 49 REAL(wp), DIMENSION(jpi,jpj) :: z_fvel_bkginc, z_hflux_bkginc 50 INTEGER :: Nbb, Nnn, Naa, Nrhs ! local definitions as placeholders for now 51 51 !! --------------------------------------------------------------------- 52 52 … … 60 60 ENDIF 61 61 62 CALL sbc ( kstp )! Sea Boundary Conditions62 CALL sbc ( kstp, Nbb, Nnn ) ! Sea Boundary Conditions 63 63 ENDIF 64 64 65 ! Cool skin 66 IF( .NOT.ln_diurnal ) CALL ctl_stop( "stp_diurnal: ln_diurnal not set" ) 67 68 IF( .NOT. ln_blk ) CALL ctl_stop( "stp_diurnal: diurnal flux processing only implemented for bulk forcing" ) 69 70 CALL diurnal_sst_coolskin_step( qns, taum, rhop(:,:,1), rdt) 71 72 CALL iom_put( "sst_wl" , x_dsst ) ! warm layer (write out before update below). 73 CALL iom_put( "sst_cs" , x_csdsst ) ! cool skin 74 75 ! Diurnal warm layer model 76 CALL diurnal_sst_takaya_step( kstp, & 77 & qsr, qns, taum, rhop(:,:,1), rdt) 65 call diurnal_layers( kstp ) ! coolskin and warm layer calculations 78 66 79 67 IF( ln_diurnal_only ) THEN 80 IF( ln_diaobs ) CALL dia_obs( kstp ) ! obs-minus-model (assimilation) diagnostics (call after dynamics update) 68 ! WILL HAVE TO INCREMENT Nbb and Nnn here in ln_diurnal_only case ! 69 IF( ln_diaobs ) CALL dia_obs( kstp, Nnn ) ! obs-minus-model (assimilation) diagnostics (call after dynamics update) 81 70 82 71 !>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> … … 84 73 !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< 85 74 IF( kstp == nit000 ) CALL iom_close( numror ) ! close input ocean restart file 86 IF( lrst_oce ) CALL rst_write ( kstp ) ! write output ocean restart file75 IF( lrst_oce ) CALL rst_write ( kstp, Nbb, Nnn ) ! write output ocean restart file 87 76 88 77 IF( ln_timing .AND. kstp == nit000 ) CALL timing_reset
Note: See TracChangeset
for help on using the changeset viewer.