Changeset 10855

Timestamp:

2019-04-09T13:32:20+02:00 (4 years ago)

Author:

smueller

Message:

Simplification of subroutine tide_update (module tide_mod) by transferring variable initialisations to other subroutines (ticket #2194)

File:

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

NEMO/branches/2019/dev_r10742_ENHANCE-12_SimonM-Tides/src/OCE/TDE/tide_mod.F90

@@ -156 +156 @@
       IF( ln_read_load ) THEN
          ALLOCATE( amp_load(jpi,jpj,nb_harmo), phi_load(jpi,jpj,nb_harmo) )
+         CALL tide_init_load
+         amp_pot(:,:,:) = amp_load(:,:,:)
+         phi_pot(:,:,:) = phi_load(:,:,:)
+      ELSE     
+         amp_pot(:,:,:) = 0._wp
+         phi_pot(:,:,:) = 0._wp   
       ENDIF
       !
@@ -254 +260 @@
       !!----------------------------------------------------------------------
 
+      IF( ln_read_load ) THEN
+    amp_pot(:,:,:) = amp_load(:,:,:)
+    phi_pot(:,:,:) = phi_load(:,:,:)
+      ELSE     
+         amp_pot(:,:,:) = 0._wp
+         phi_pot(:,:,:) = 0._wp   
+      ENDIF
       DO jk = 1, nb_harmo
          zcons = rn_tide_gamma * tide_components(jk)%equitide * tide_harmonics(jk)%f
@@ -327 +340 @@
       IF( nsec_day == NINT(0.5_wp * rdt) .OR. kt == nit000 ) THEN      ! start a new day
          !
-         !
-         IF( ln_read_load )THEN
-            IF ( kt == nit000 ) CALL tide_init_load
-            amp_pot(:,:,:) = amp_load(:,:,:)
-            phi_pot(:,:,:) = phi_load(:,:,:)
-         ELSE 
-            amp_pot(:,:,:) = 0._wp
-            phi_pot(:,:,:) = 0._wp
-         ENDIF
-         pot_astro(:,:) = 0._wp
-         !
          ! If the run does not start from midnight then need to initialise tides
          ! at the start of the current day (only occurs when kt==nit000)