Changeset 3957

Timestamp:

2013-07-05T16:30:37+02:00 (11 years ago)

Author:

acc

Message:

Branch 2013/dev_r3858_NOC_ZTC, #863. Fixes to tidal potential forcing changes to ensure no numerical changes due to the re-styling

Location:

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynspg.F90 (modified) (1 diff)
• SBC/sbctide.F90 (modified) (3 diffs)
• SBC/tideini.F90 (modified) (1 diff)

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -147 +147 @@
                DO ji = fs_2, fs_jpim1   ! vector opt.
                   spgu(ji,jj) = spgu(ji,jj) + ( zpice(ji+1,jj) - zpice(ji,jj) ) / e1u(ji,jj)
-                  spgv(ji,jj) = spgu(ji,jj) + ( zpice(ji,jj+1) - zpice(ji,jj) ) / e2v(ji,jj)
+                  spgv(ji,jj) = spgv(ji,jj) + ( zpice(ji,jj+1) - zpice(ji,jj) ) / e2v(ji,jj)
                END DO
             END DO

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90

@@ -49 +49 @@
       !!----------------------------------------------------------------------
 
-      IF( kt /= nit000 )   CALL tide_init( kt )
-
-      IF( nsec_day == NINT(0.5 * rdttra(1)) ) THEN      ! start a new day
+      IF( nsec_day == NINT(0.5_wp * rdttra(1)) ) THEN      ! start a new day
          !
          IF( kt == nit000 ) THEN
             ALLOCATE( amp_pot(jpi,jpj,nb_harmo),                      &
                &      phi_pot(jpi,jpj,nb_harmo), pot_astro(jpi,jpj)   )
-            !
-            amp_pot(:,:,:) = 0._wp
-            phi_pot(:,:,:) = 0._wp
-            pot_astro(:,:) = 0._wp
          ENDIF
+         !
+         amp_pot(:,:,:) = 0._wp
+         phi_pot(:,:,:) = 0._wp
+         pot_astro(:,:) = 0._wp
          !
          CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo )
@@ -91 +89 @@
 
       DO jk = 1, nb_harmo
-         zcons = 0.7 * Wave(ntide(jk))%equitide * ftide(jk)
+         zcons = 0.7_wp * Wave(ntide(jk))%equitide * ftide(jk)
          DO ji = 1, jpi
             DO jj = 1, jpj
@@ -100 +98 @@
                ztmp = v0tide(jk) + utide(jk) + Wave(ntide(jk))%nutide * zlon
                ! le potentiel est composé des effets des astres:
-               IF( Wave(ntide(jk))%nutide == 1 )   zcs = zcons * SIN( 2.*zlat )
-               IF( Wave(ntide(jk))%nutide == 2 )   zcs = zcons * COS( zlat )**2
+               IF    ( Wave(ntide(jk))%nutide == 1 )  THEN  ;  zcs = zcons * SIN( 2._wp*zlat )
+               ELSEIF( Wave(ntide(jk))%nutide == 2 )  THEN  ;  zcs = zcons * COS( zlat )**2
+               ELSE                                         ;  zcs = 0._wp
+               ENDIF
                ztmp1 = ztmp1 + zcs * COS( ztmp )
                ztmp2 = ztmp2 - zcs * SIN( ztmp )
                zamp = SQRT( ztmp1*ztmp1 + ztmp2*ztmp2 )
                amp_pot(ji,jj,jk) = zamp
-               phi_pot(ji,jj,jk) = ATAN2( -ztmp2 / MAX( 1.e-10 , zamp ) ,   &
-                  &                        ztmp1 / MAX( 1.e-10,  zamp )   )
+               phi_pot(ji,jj,jk) = ATAN2( -ztmp2 / MAX( 1.e-10_wp , zamp ) ,   &
+                  &                        ztmp1 / MAX( 1.e-10_wp,  zamp )   )
             END DO
          END DO

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90

@@ -104 +104 @@
       ENDIF
       !
-      IF( nsec_day == NINT(0.5 * rdttra(1)) ) THEN
-         !
-         CALL tide_harmo( omega_tide, v0tide, utide, ftide, ntide, nb_harmo )
-         !
-         kt_tide = kt
-         !
-         IF(lwp) THEN
-            WRITE(numout,*)
-            WRITE(numout,*) 'tide_ini : Update of the tidal components at kt=', kt
-            WRITE(numout,*) '~~~~~~~~ '
-            DO jk = 1, nb_harmo
-               WRITE(numout,*) Wave(ntide(jk))%cname_tide, utide(jk), ftide(jk), v0tide(jk), omega_tide(jk)
-            END DO
-         ENDIF
-         !
-      ENDIF
-      !
    END SUBROUTINE tide_init