Changeset 15547 for NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/SBC/tide_mod.F90

Timestamp:

2021-11-27T11:04:33+01:00 (3 years ago)

Author:

hadjt

Message:

Moving ftide, utide, v0tide output to sbctides, adding tide_t output to diaharm_fast

File:

• NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/SBC/tide_mod.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.4_CO9_shelf_climate/src/OCE/SBC/tide_mod.F90

@@ -15 +15 @@
    USE ioipsl  , ONLY :   ymds2ju      ! for calendar
 
+   USE iom
 
    IMPLICIT NONE
@@ -25 +26 @@
    ! davbyr: increase maximum number of harmonics from 19 to 34
    INTEGER, PUBLIC, PARAMETER ::   jpmax_harmo = 34   !: maximum number of harmonic
+
+
+   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:) ::   v0linearintercept            
+
+
 
    TYPE, PUBLIC ::    tide
@@ -140 +146 @@
       ENDIF
 
-      IF ( ln_tide_compress   )  CALL astronomic_angle_origin
+      !IF ( ln_tide_compress   )  
+      CALL astronomic_angle_origin
 
    END SUBROUTINE tide_init_calendar_options
@@ -969 +976 @@
       REAL(wp)                             :: hours_since_origin
       REAL(wp), DIMENSION(kc) ::   pomega           ! pulsation in radians/s
-      REAL(wp), DIMENSION(kc) ::   freq_per_day,   v0linearslope,v0linearintercept             ! pulsation in radians/s  !offset,cycle_reset,freq,per_hr
+      REAL(wp), DIMENSION(kc) ::   freq_per_day,   v0linearslope ! ,v0linearintercept             ! pulsation in radians/s  !offset,cycle_reset,freq,per_hr
+      CHARACTER (len=40) :: tmp_name
       !! JT for compress
 
 
+      IF( .NOT. ALLOCATED(v0linearintercept) )  ALLOCATE( v0linearintercept(kc)   )
+    
 
       IF ( ln_tide_compress) THEN
@@ -1274 +1284 @@
          !  Linear with time
 
+        v0linearintercept(jh) = sh_T_o * Wave( ktide(jh) )%nT    &
+            &    + sh_s_o * Wave( ktide(jh) )%ns    &
+            &    + sh_h_o * Wave( ktide(jh) )%nh    &
+            &    + sh_p_o * Wave( ktide(jh) )%np    &
+            &    + sh_p1_o* Wave( ktide(jh) )%np1   &
+            &    +          Wave( ktide(jh) )%shift * rad
+
+
          IF ( ln_tide_compress ) THEN
-
-            v0linearintercept(jh) = sh_T_o * Wave( ktide(jh) )%nT    &
-                &    + sh_s_o * Wave( ktide(jh) )%ns    &
-                &    + sh_h_o * Wave( ktide(jh) )%nh    &
-                &    + sh_p_o * Wave( ktide(jh) )%np    &
-                &    + sh_p1_o* Wave( ktide(jh) )%np1   &
-                &    +          Wave( ktide(jh) )%shift * rad
-
-
 
              !JT pvt(jh) = mod(  ( (v0linearslope(jh)*days_since_origin) + v0linearintercept(  ktide(jh)  ) ),  2*rpi)-(2*rpi)
@@ -1329 +1338 @@
           END DO
       ENDIF
+
+
+
+
+    DO jh = 1, kc       
+
+        tmp_name=TRIM(Wave(ktide(jh))%cname_tide)//'_utide'
+        IF( iom_use(TRIM(tmp_name)) )  THEN
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anau(jh) )
+            CALL iom_put( TRIM(tmp_name), put(jh) )
+        !ELSE
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
+        ENDIF    
+
+        tmp_name=TRIM(Wave(ktide(jh))%cname_tide)//'_v0tide'
+        IF( iom_use(TRIM(tmp_name)) )  THEN
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anav(jh) )
+            CALL iom_put( TRIM(tmp_name), pvt(jh) )
+        !ELSE
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
+        ENDIF
+
+        tmp_name=TRIM(Wave(ktide(jh))%cname_tide)//'_v0tide_origin'
+        IF( iom_use(TRIM(tmp_name)) )  THEN
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anav(jh) )
+            CALL iom_put( TRIM(tmp_name), v0linearintercept(jh) )
+        !ELSE
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
+        ENDIF
+
+
+
+
+        tmp_name=TRIM(Wave(ktide(jh))%cname_tide)//'_ftide'
+        IF( iom_use(TRIM(tmp_name)) )  THEN
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: iom_put: ",TRIM(tmp_name),'; shape = ', SHAPE(anaf(jh) )
+            CALL iom_put( TRIM(tmp_name), pcor(jh) )
+        !ELSE
+        !    IF(lwp) WRITE(numout,*) "harm_ana_out: not requested: ",TRIM(tmp_name)
+        ENDIF
+
+     END DO
+
+
+
+
+
+
+
+
+