Changeset 5203 for branches/2014/dev_r4650_UKMO7_STARTHOUR
- Timestamp:
- 2015-04-08T16:20:22+02:00 (9 years ago)
- Location:
- branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90
r5075 r5203 316 316 ENDIF 317 317 318 IF ( nsec_day == NINT(0.5_wp * rdttra(1)) .AND. zflag==1 ) THEN318 IF ( (nsec_day == NINT(0.5_wp * rdttra(1)) .OR. kt==nit000) .AND. zflag==1 ) THEN 319 319 ! 320 kt_tide = kt 320 kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1) 321 321 ! 322 322 IF(lwp) THEN … … 431 431 ! We refresh nodal factors every day below 432 432 ! This should be done somewhere else 433 IF ( nsec_day == NINT(0.5_wp * rdttra(1)) .AND. lk_first_btstp ) THEN434 ! 435 kt_tide = kt 433 IF ( ( nsec_day == NINT(0.5_wp * rdttra(1)) .OR. kt==nit000 ) .AND. lk_first_btstp ) THEN 434 ! 435 kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1) 436 436 ! 437 437 IF(lwp) THEN -
branches/2014/dev_r4650_UKMO7_STARTHOUR/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90
r5164 r5203 47 47 INTEGER, INTENT( in ) :: kt ! ocean time-step 48 48 INTEGER :: jk ! dummy loop index 49 INTEGER :: nsec_day_orig ! Temporary variable 49 50 !!---------------------------------------------------------------------- 50 51 IF( nsec_day == NINT(0.5_wp * rdttra(1)) ) THEN ! start a new day51 52 IF( nsec_day == NINT(0.5_wp * rdttra(1)) .OR. kt == nit000 ) THEN ! start a new day 52 53 ! 53 54 IF( kt == nit000 ) THEN … … 60 61 pot_astro(:,:) = 0._wp 61 62 ! 63 ! If the run does not start from midnight then need to initialise tides 64 ! at the start of the current day (only occurs when kt==nit000) 65 ! Temporarily set nsec_day to beginning of day. 66 nsec_day_orig = nsec_day 67 kt_tide = kt - (nsec_day - 0.5_wp * rdttra(1))/rdttra(1) 68 IF ( nsec_day /= NINT(0.5_wp * rdttra(1)) THEN 69 nsec_day = NINT(0.5_wp * rdttra(1)) 70 ENDIF 62 71 CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo ) 63 72 ! 64 kt_tide = kt65 73 ! 66 74 IF(lwp) THEN … … 75 83 IF( ln_tide_pot ) CALL tide_init_potential 76 84 ! 85 ! Reset nsec_day 86 nsec_day = nsec_day_orig 77 87 ENDIF 78 88 !
Note: See TracChangeset
for help on using the changeset viewer.