Changeset 9033 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

Timestamp:

2017-12-14T11:29:10+01:00 (6 years ago)

Author:

timgraham

Message:

Commit final files from merge of NEMOGCM and some fixes for waves (taooc renamed tauwoc)

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/SBC/sbcwave.F90

@@ -45 +45 @@
    LOGICAL, PUBLIC ::   cpl_wfreq  = .FALSE.
    LOGICAL, PUBLIC ::   cpl_wnum   = .FALSE.
-   LOGICAL, PUBLIC ::   cpl_tauoc  = .FALSE.
+   LOGICAL, PUBLIC ::   cpl_tauwoc  = .FALSE.
    LOGICAL, PUBLIC ::   cpl_tauw   = .FALSE.
    LOGICAL, PUBLIC ::   cpl_wdrag  = .FALSE.
@@ -59 +59 @@
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_sd      ! structure of input fields (file informations, fields read) Stokes Drift
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_wn      ! structure of input fields (file informations, fields read) wave number for Qiao
-   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tauoc   ! structure of input fields (file informations, fields read) normalized wave stress into the ocean
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tauwoc   ! structure of input fields (file informations, fields read) normalized wave stress into the ocean
    TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_tauw    ! structure of input fields (file informations, fields read) ocean stress components from wave model
 
@@ -255 +255 @@
       INTEGER  ::   jj, ji   ! dummy loop argument
       !
-      IF( ln_tauoc ) THEN
+      IF( ln_tauwoc ) THEN
          utau(:,:) = utau(:,:)*tauoc_wave(:,:)
          vtau(:,:) = vtau(:,:)*tauoc_wave(:,:)
@@ -300 +300 @@
       ENDIF
 
-      IF( ln_tauoc .AND. .NOT. cpl_tauoc ) THEN    !==  Wave induced stress  ==!
-         CALL fld_read( kt, nn_fsbc, sf_tauoc )          ! read wave norm stress from external forcing
-         tauoc_wave(:,:) = sf_tauoc(1)%fnow(:,:,1)
+      IF( ln_tauwoc .AND. .NOT. cpl_tauwoc ) THEN    !==  Wave induced stress  ==!
+         CALL fld_read( kt, nn_fsbc, sf_tauwoc )          ! read wave norm stress from external forcing
+         tauoc_wave(:,:) = sf_tauwoc(1)%fnow(:,:,1)
       ENDIF
 
@@ -362 +362 @@
       TYPE(FLD_N)            ::  sn_cdg, sn_usd, sn_vsd,  &
                              &   sn_hsw, sn_wmp, sn_wfr, sn_wnum, &
-                             &   sn_tauoc, sn_tauwx, sn_tauwy      ! informations about the fields to be read
+                             &   sn_tauwoc, sn_tauwx, sn_tauwy      ! informations about the fields to be read
       !
       NAMELIST/namsbc_wave/  sn_cdg, cn_dir, sn_usd, sn_vsd, sn_hsw, sn_wmp, sn_wfr, &
-                             sn_wnum, sn_tauoc, sn_tauwx, sn_tauwy
+                             sn_wnum, sn_tauwoc, sn_tauwx, sn_tauwy
       !!---------------------------------------------------------------------
       !
@@ -389 +389 @@
       ENDIF
 
-      IF( ln_tauoc ) THEN
-         IF( .NOT. cpl_tauoc ) THEN
-            ALLOCATE( sf_tauoc(1), STAT=ierror )           !* allocate and fill sf_wave with sn_tauoc
+      IF( ln_tauwoc ) THEN
+         IF( .NOT. cpl_tauwoc ) THEN
+            ALLOCATE( sf_tauwoc(1), STAT=ierror )           !* allocate and fill sf_wave with sn_tauwoc
             IF( ierror > 0 )   CALL ctl_stop( 'STOP', 'sbc_wave_init: unable to allocate sf_wave structure' )
             !
-                                    ALLOCATE( sf_tauoc(1)%fnow(jpi,jpj,1)   )
-            IF( sn_tauoc%ln_tint )  ALLOCATE( sf_tauoc(1)%fdta(jpi,jpj,1,2) )
-            CALL fld_fill( sf_tauoc, (/ sn_tauoc /), cn_dir, 'sbc_wave_init', 'Wave module', 'namsbc_wave' )
+                                    ALLOCATE( sf_tauwoc(1)%fnow(jpi,jpj,1)   )
+            IF( sn_tauwoc%ln_tint )  ALLOCATE( sf_tauwoc(1)%fdta(jpi,jpj,1,2) )
+            CALL fld_fill( sf_tauwoc, (/ sn_tauwoc /), cn_dir, 'sbc_wave_init', 'Wave module', 'namsbc_wave' )
          ENDIF
          ALLOCATE( tauoc_wave(jpi,jpj) )