Changeset 5924 for branches

Timestamp:

2015-11-26T11:15:27+01:00 (8 years ago)

Author:

jcastill

Message:

Add sea surface height to the list of fields that can be passed to waves (done independently of OPA->SAS coupling, which should not be affected)

File:

• branches/UKMO/dev_r5518_ww3_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90 (modified) (4 diffs)

branches/UKMO/dev_r5518_ww3_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -157 +157 @@
    TYPE(FLD_C) ::   sn_rcv_cal, sn_rcv_iceflx, sn_rcv_co2, sn_rcv_mslp                          
    ! Send to waves
-   TYPE(FLD_C) ::   sn_snd_ifrac, sn_snd_crtw
+   TYPE(FLD_C) ::   sn_snd_ifrac, sn_snd_crtw, sn_snd_ssh
    ! Received from waves
    TYPE(FLD_C) ::   sn_rcv_hsig,sn_rcv_phioc
@@ -233 +233 @@
       NAMELIST/namsbc_cpl/  sn_snd_temp , sn_snd_alb  , sn_snd_thick , sn_snd_crt   , sn_snd_co2,      &
          &                  sn_rcv_w10m, sn_rcv_taumod, sn_rcv_tau   , sn_rcv_dqnsdt, sn_rcv_qsr,      &
-         &                  sn_snd_ifrac, sn_snd_crtw , sn_rcv_hsig  , sn_rcv_phioc ,                  &
+         &                  sn_snd_ifrac, sn_snd_crtw , sn_snd_ssh   , sn_rcv_hsig  , sn_rcv_phioc ,   &
          &                  sn_rcv_qns , sn_rcv_emp   , sn_rcv_rnf   , sn_rcv_cal   , sn_rcv_iceflx,   &
          &                  sn_rcv_co2 , nn_cplmodel  , ln_usecplmask, sn_rcv_mslp
@@ -288 +288 @@
          WRITE(numout,*)'                      - mesh          = ', sn_snd_crt%clvgrd
          WRITE(numout,*)'      oce co2 flux                    = ', TRIM(sn_snd_co2%cldes   ), ' (', TRIM(sn_snd_co2%clcat   ), ')'
+         WRITE(numout,*)'      sea surface height              = ', TRIM(sn_snd_ssh%cldes   ), ' (', TRIM(sn_snd_ssh%clcat   ), ')'
          WRITE(numout,*)'      mean sea level pressure         = ', TRIM(sn_rcv_mslp%cldes  ), ' (', TRIM(sn_rcv_mslp%clcat  ), ')'
          WRITE(numout,*)'      surface current to waves        = ', TRIM(sn_snd_crtw%cldes   ), ' (', TRIM(sn_snd_crtw%clcat   ), ')'
@@ -747 +748 @@
       ssnd(jps_co2)%clname = 'O_CO2FLX' ;  IF( TRIM(sn_snd_co2%cldes) == 'coupled' )    ssnd(jps_co2 )%laction = .TRUE.
 
+      !                                                      ! ------------------------- !
+      !                                                      !     Sea surface height    !
+      !                                                      ! ------------------------- !
+      ssnd(jps_ssh)%clname = 'O_SSHght' ;  IF( TRIM(sn_snd_ssh%cldes) == 'coupled' )    ssnd(jps_ssh )%laction = .TRUE.
+
       !                                                      ! ------------------------------- !
       !                                                      !   OPA-SAS coupling - snd by opa !   
       !                                                      ! ------------------------------- !
-      ssnd(jps_ssh   )%clname = 'O_SSHght' 
       ssnd(jps_soce  )%clname = 'O_SSSal' 
       ssnd(jps_e3t1st)%clname = 'O_E3T1st'