Changeset 10840 for NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/DIA/diaharm.F90

Timestamp:

2019-04-04T19:09:12+02:00 (5 years ago)

Author:

smueller

Message:

Simplification of initialisation of tidal-constituent parameters (module tide_mod) (ticket #2194)

File:

• NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/DIA/diaharm.F90 (modified) (3 diffs)

NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/DIA/diaharm.F90

@@ -71 +71 @@
       INTEGER :: jh, nhan, jk, ji
       INTEGER ::   ios                 ! Local integer output status for namelist read
-      TYPE(tide),          DIMENSION(:), POINTER ::   tide_components ! Selected tidal components
       TYPE(tide_harmonic), DIMENSION(:), POINTER ::   tide_harmonics  ! Oscillation parameters of selected tidal components
 
@@ -109 +108 @@
          &                        CALL ctl_stop( 'dia_harm_init : analysis time span must be a multiple of nstep_han' )
 
-      ! Request parameters for tidal components that have been selected for
-      ! harmonic analysis
-      CALL tide_init_components(tname, tide_components)
+      ! Initialize oscillation parameters for tidal components that have been
+      ! selected for harmonic analysis
+      ! ---------------------------------------------------------------------
+      CALL tide_init_harmonics(tname, tide_harmonics)
       ! Number of tidal components selected for harmonic analysis
-      nb_ana = size(tide_components)
+      nb_ana = size(tide_harmonics)
       !
       IF(lwp) THEN
@@ -126 +126 @@
          CALL ctl_stop( 'dia_harm_init', ctmp1, ctmp2 )
       ENDIF
-
-      ! Initialize oscillation parameters of selected tidal components
-      ! --------------------------------------------------------------
-      CALL tide_init_harmonics( tide_components, tide_harmonics)
 
       IF(lwp) WRITE(numout,*) 'Analysed frequency  : ',nb_ana ,'Frequency '