New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10251 for branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90 – NEMO

Ignore:
Timestamp:
2018-10-29T15:20:26+01:00 (5 years ago)
Author:
kingr
Message:

Rolled back to r10247 - i.e., undid merge of pkg br and 3.6_stable br

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_AMM15_package/NEMOGCM/NEMO/OPA_SRC/BDY/bdytides.F90

    r10249 r10251  
    5050      REAL(wp), POINTER, DIMENSION(:,:,:)    ::   v          !: Tidal constituents : V    (after nodal cor.) 
    5151   END TYPE TIDES_DATA 
    52    INTEGER, PUBLIC, PARAMETER                  ::   jptides_max = 15      !: Max number of tidal contituents 
    53       LOGICAL, PUBLIC                           ::   ln_harm_ana_store    !: =T Stores data for  harmonic Analysis 
    54       LOGICAL, PUBLIC                           ::   ln_harm_ana_compute     !: =T  Compute harmonic Analysis 
    55       LOGICAL, PUBLIC                           ::   ln_harmana_read         !: =T  Decide to do the analysis  
    56                                                                              !from scratch or continue previous run 
    5752 
    5853!$AGRIF_DO_NOT_TREAT 
     
    9590      TYPE(MAP_POINTER), DIMENSION(jpbgrd)      ::   ibmap_ptr           !: array of pointers to nbmap 
    9691      !! 
    97       NAMELIST/nambdy_tide/filtide, ln_bdytide_2ddta, ln_bdytide_conj, ln_harm_ana_store, ln_harm_ana_compute, ln_harmana_read 
     92      NAMELIST/nambdy_tide/filtide, ln_bdytide_2ddta, ln_bdytide_conj 
    9893      !!---------------------------------------------------------------------- 
    9994 
     
    107102 
    108103      REWIND(numnam_cfg) 
    109       REWIND(numnam_ref)   ! slwa 
    110104 
    111105      DO ib_bdy = 1, nb_bdy 
     
    131125            IF(lwp) WRITE(numout,*) '             assume complex conjugate   : ', ln_bdytide_conj 
    132126            IF(lwp) WRITE(numout,*) '             Number of tidal components to read: ', nb_harmo 
    133             IF(lwp) WRITE(numout,*) '             Use PCOMS harmonic ananalysis or not: ', ln_harm_ana_store 
    134             IF(lwp) WRITE(numout,*) '             Compute Final  harmonic ananalysis or not: ', ln_harm_ana_compute 
    135             IF(lwp) WRITE(numout,*) '             Read in previous days harmonic data or start afresh: ', ln_harmana_read 
    136127            IF(lwp) THEN  
    137128                    WRITE(numout,*) '             Tidal components: '  
     
    425416      ! Absolute time from model initialization:    
    426417      IF( PRESENT(kit) ) THEN   
    427          z_arg = ( kt + (kit+time_add-1) / REAL(nn_baro,wp) ) * rdt 
     418         z_arg = ( kt + (kit+0.5_wp*(time_add-1)) / REAL(nn_baro,wp) ) * rdt 
    428419      ELSE                               
    429420         z_arg = ( kt + time_add ) * rdt 
Note: See TracChangeset for help on using the changeset viewer.