Changeset 3583 for branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2012-11-16T17:18:17+01:00 (12 years ago)

Author:

cbricaud

Message:

add modification from dev_r3327_MERCATOR1_BDY branch in dev_MERCATOR_2012_rev3555 branch

Location:

branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• fldread.F90 (modified) (4 diffs)
• sbcapr.F90 (modified) (2 diffs)
• sbctide.F90 (modified) (3 diffs)
• tideini.F90 (copied) (copied from branches/2012/dev_r3327_MERCATOR1_BDY/NEMOGCM/NEMO/OPA_SRC/SBC/tideini.F90)
• updtide.F90 (modified) (3 diffs)

branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -667 +667 @@
       !!----------------------------------------------------------------------
 #if defined key_bdy
-      USE bdy_oce, ONLY:  dta_global         ! workspace to read in global data arrays
+      USE bdy_oce, ONLY:  dta_global, dta_global2         ! workspace to read in global data arrays
 #endif 
 
@@ -681 +681 @@
       INTEGER                                 ::   ilendta  ! length of data in file
       INTEGER                                 ::   idvar    ! variable ID
-      INTEGER                                 ::   ib, ik   ! loop counters
+      INTEGER                                 ::   ib, ik, ji, jj   ! loop counters
       INTEGER                                 ::   ierr
-      REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read ! work space for global data
+      REAL(wp), POINTER, DIMENSION(:,:,:)     ::   dta_read  ! work space for global data
       !!---------------------------------------------------------------------
             
-#if defined key_bdy
-      dta_read => dta_global
-#endif
-
       ipi = SIZE( dta, 1 )
       ipj = 1
@@ -696 +692 @@
       idvar   = iom_varid( num, clvar )
       ilendta = iom_file(num)%dimsz(1,idvar)
+
+#if defined key_bdy
+      ipj = iom_file(num)%dimsz(2,idvar)
+      IF (ipj == 1) THEN ! we assume that this is a structured open boundary file
+         dta_read => dta_global
+      ELSE
+         dta_read => dta_global2
+      ENDIF
+#endif
+
+      IF ((lwp).AND.(ipi>ilendta*ipj)) CALL ctl_stop('fld_map problem with file dimension')
+
       IF(lwp) WRITE(numout,*) 'Dim size for ',TRIM(clvar),' is ', ilendta
       IF(lwp) WRITE(numout,*) 'Number of levels for ',TRIM(clvar),' is ', ipk
+
 
       SELECT CASE( ipk )
@@ -706 +715 @@
       END SELECT
       !
-      DO ib = 1, ipi
-         DO ik = 1, ipk
-            dta(ib,1,ik) =  dta_read(map(ib),1,ik)
+      IF (ipj==1) THEN
+         DO ib = 1, ipi
+            DO ik = 1, ipk
+               dta(ib,1,ik) =  dta_read(map(ib),1,ik)
+            END DO
          END DO
-      END DO
+      ELSE ! we assume that this is a structured open boundary file
+         DO ib = 1, ipi
+            jj=1+floor(REAL(map(ib)-1)/REAL(ilendta))
+            ji=map(ib)-(jj-1)*ilendta
+            DO ik = 1, ipk
+               dta(ib,1,ik) =  dta_read(ji,jj,ik)
+            END DO
+         END DO
+      ENDIF
 
    END SUBROUTINE fld_map

branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

@@ -66 +66 @@
       !!
       INTEGER            ::   ierror  ! local integer 
-      REAL(wp)           ::   zpref   ! local scalar
       !!
       CHARACTER(len=100) ::  cn_dir   ! Root directory for location of ssr files
       TYPE(FLD_N)        ::  sn_apr   ! informations about the fields to be read
       !!
-      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr
+      NAMELIST/namsbc_apr/ cn_dir, sn_apr, ln_ref_apr, rpref, ln_apr_obc
       !!----------------------------------------------------------------------
       !
@@ -113 +112 @@
          !
          !                                            !* control check
-         IF( ln_apr_obc  )   &
-            CALL ctl_stop( 'sbc_apr: inverse barometer added to OBC ssh data not yet implemented ' )
-         IF( ln_apr_obc .AND. .NOT. lk_obc )   &
-            CALL ctl_stop( 'sbc_apr: add inverse barometer to OBC requires to use key_obc' )
+         IF ( ln_apr_obc  ) THEN
+            IF(lwp) WRITE(numout,*) '         Inverse barometer added to OBC ssh data'
+         ENDIF
          IF( ( ln_apr_obc ) .AND. .NOT. lk_dynspg_ts )   &
             CALL ctl_stop( 'sbc_apr: use inverse barometer ssh at open boundary ONLY possible with time-splitting' )

branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/sbctide.F90

@@ -14 +14 @@
   USE daymod
   USE dynspg_oce
-  USE tide_mod
+  USE tideini
   USE iom
 
@@ -21 +21 @@
 
   REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:,:) :: pot_astro
-  LOGICAL, PUBLIC :: ln_tide_pot = .false.
+
 #if defined key_tide
 
   LOGICAL, PUBLIC, PARAMETER ::   lk_tide  = .TRUE.
-
-  REAL(wp), PUBLIC, ALLOCATABLE, DIMENSION(:) :: omega_tide 
-
-  REAL(wp), ALLOCATABLE, DIMENSION(:) ::  &
-       v0tide,      &
-       utide,       &
-       ftide
-
   REAL(wp), ALLOCATABLE, DIMENSION(:,:,:) :: amp_pot,phi_pot
-
-  INTEGER, PUBLIC :: nb_harmo
-  INTEGER, PUBLIC, ALLOCATABLE, DIMENSION(:) :: ntide
-  INTEGER, PUBLIC :: nn_tide, kt_tide
-
   !!---------------------------------------------------------------------------------
   !!   OPA 9.0 , LODYC-IPSL  (2003)
@@ -51 +38 @@
     !! * Arguments
     INTEGER, INTENT( in ) ::   kt     ! ocean time-step
-    !! * Local declarations
-    INTEGER  :: jk,ji
-    CHARACTER(LEN=4), DIMENSION(jpmax_harmo) :: clname
     !!----------------------------------------------------------------------
 
-    NAMELIST/nam_tide/ln_tide_pot,nb_harmo,clname,nn_tide
+    IF ( kt == nit000 .AND. .NOT. lk_dynspg_ts )  CALL ctl_stop( 'STOP', 'sbc_tide : tidal potential use only with time splitting' )
 
-    IF ( kt == nit000 ) THEN
+    IF ( nsec_day == NINT(0.5 * rdttra(1)) ) THEN
+      !
+      kt_tide = kt
 
-       IF( .NOT. lk_dynspg_ts  )  CALL ctl_stop( 'STOP', 'sbc_tide : tidal potential use only with time splitting' )
+      IF(lwp) THEN
+         WRITE(numout,*)
+         WRITE(numout,*) 'sbc_tide : (re)Initialization of the tidal potential at kt=',kt
+         WRITE(numout,*) '~~~~~~~ '
+      ENDIF
 
-    ! Read Namelist nam_tide
+      IF(lwp) THEN
+         IF ( kt == nit000 ) WRITE(numout,*) 'Apply astronomical potential : ln_tide_pot =', ln_tide_pot
+         CALL flush(numout)
+      ENDIF
 
-    nn_tide=INT(rday/rdt)
+      IF ( kt == nit000 ) ALLOCATE(amp_pot(jpi,jpj,nb_harmo))
+      IF ( kt == nit000 ) ALLOCATE(phi_pot(jpi,jpj,nb_harmo))
+      IF ( kt == nit000 ) ALLOCATE(pot_astro(jpi,jpj))
 
-    CALL tide_init_Wave
+      amp_pot(:,:,:) = 0.e0
+      phi_pot(:,:,:) = 0.e0
+      pot_astro(:,:) = 0.e0
 
-    REWIND ( numnam )
-    READ   ( numnam, nam_tide )
-
-    IF(lwp) THEN
-       WRITE(numout,*)
-       WRITE(numout,*) 'sbc_tide : Initialization of the tidal components'
-       WRITE(numout,*) '~~~~~~~ '
+      IF ( ln_tide_pot ) CALL tide_init_potential
+      !
     ENDIF
-
-    IF(lwp) THEN
-       WRITE(numout,*) '        Namelist nam_tide'
-       WRITE(numout,*) '        Apply astronomical potential : ln_tide_pot =', ln_tide_pot
-       WRITE(numout,*) '        nb_harmo    = ', nb_harmo
-       CALL flush(numout)
-    ENDIF
-
-    ALLOCATE(ntide     (nb_harmo))
-    DO jk=1,nb_harmo
-       DO ji=1,jpmax_harmo
-          IF (TRIM(clname(jk)) .eq. Wave(ji)%cname_tide) THEN
-             ntide(jk) = ji
-             EXIT
-          END IF
-       END DO
-    END DO
-    ALLOCATE(omega_tide(nb_harmo))
-    ALLOCATE(v0tide    (nb_harmo))
-    ALLOCATE(utide     (nb_harmo))
-    ALLOCATE(ftide     (nb_harmo))
-    ALLOCATE(amp_pot(jpi,jpj,nb_harmo))
-    ALLOCATE(phi_pot(jpi,jpj,nb_harmo))
-    ALLOCATE(pot_astro(jpi,jpj))
-    ENDIF
-
-    IF ( MOD( kt - 1, nn_tide ) == 0 ) THEN
-      kt_tide = kt
-      CALL tide_harmo(omega_tide, v0tide, utide, ftide, ntide, nb_harmo)
-    ENDIF
-
-    amp_pot(:,:,:) = 0.e0
-    phi_pot(:,:,:) = 0.e0
-    pot_astro(:,:) = 0.e0
-
-    IF (ln_tide_pot          ) CALL tide_init_potential
 
   END SUBROUTINE sbc_tide

branches/2012/dev_MERCATOR_2012_rev3555/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

@@ -13 +13 @@
   USE sbctide
   USE dynspg_oce
+  USE tideini, ONLY: ln_tide_ramp, rdttideramp
 
   IMPLICIT NONE
@@ -33 +34 @@
     INTEGER, INTENT( in ) ::   kt,kit      ! ocean time-step index
     INTEGER  :: ji,jj,jk
+    REAL (wp) :: zramp
     REAL (wp), DIMENSION(nb_harmo) :: zwt 
-    !...............................................................................
-    ! Potentiel astronomique
     !...............................................................................
 
     pot_astro(:,:)=0.e0
+    zramp = 1.e0
 
     IF (lk_dynspg_ts) THEN
        zwt(:) = omega_tide(:)* ((kt-kt_tide)*rdt + kit*(rdt/REAL(nn_baro,wp)))
+       IF (ln_tide_ramp) THEN
+          zramp = MIN(MAX( ((kt-nit000)*rdt + kit*(rdt/REAL(nn_baro,wp)))/(rdttideramp*rday),0.),1.)
+       ENDIF
     ELSE
        zwt(:) = omega_tide(:)*(kt-kt_tide)*rdt
+       IF (ln_tide_ramp) THEN
+          zramp = MIN(MAX( ((kt-nit000)*rdt)/(rdttideramp*rday),0.),1.) 
+       ENDIF  
     ENDIF
 
@@ -49 +56 @@
        do ji=1,jpi
           do jj=1,jpj
-             pot_astro(ji,jj)=pot_astro(ji,jj) + (amp_pot(ji,jj,jk)*COS(zwt(jk)+phi_pot(ji,jj,jk)))      
+             pot_astro(ji,jj)=pot_astro(ji,jj) + zramp*(amp_pot(ji,jj,jk)*COS(zwt(jk)+phi_pot(ji,jj,jk)))      
           enddo
        enddo