New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 10322 for NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC – NEMO

Ignore:
Timestamp:
2018-11-16T16:06:47+01:00 (5 years ago)
Author:
davestorkey
Message:

UKMO/dev_r9950_GO8_package: Update to be relative to rev 10321 of NEMO4_beta_mirror branch.

Location:
NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC
Files:
30 edited
1 copied

Legend:

Unmodified
Added
Removed

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/cpl_oasis3.F90

    r9950 r10322  
    6969   INTEGER, PUBLIC, PARAMETER ::   nmaxcat=5    ! Maximum number of coupling fields 
    7070   INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields 
     71   LOGICAL, PARAMETER         ::   ltmp_wapatch = .TRUE.   ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define   
     72   INTEGER                    ::   nldi_save, nlei_save 
     73   INTEGER                    ::   nldj_save, nlej_save 
    7174    
    7275   TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information 
    … …  
    8790   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    8891   !! $Id$ 
    89    !! Software governed by the CeCILL licence     (./LICENSE) 
     92   !! Software governed by the CeCILL license (see ./LICENSE) 
    9093   !!---------------------------------------------------------------------- 
    9194CONTAINS 
    … …  
    145148      !!-------------------------------------------------------------------- 
    146149 
     150      ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define 
     151      IF ( ltmp_wapatch ) THEN 
     152         nldi_save = nldi   ;   nlei_save = nlei 
     153         nldj_save = nldj   ;   nlej_save = nlej 
     154         IF( nimpp           ==      1 ) nldi = 1 
     155         IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi 
     156         IF( njmpp           ==      1 ) nldj = 1 
     157         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
     158      ENDIF  
    147159      IF(lwp) WRITE(numout,*) 
    148160      IF(lwp) WRITE(numout,*) 'cpl_define : initialization in coupled ocean/atmosphere case' 
    … …  
    296308      IF( nerror /= OASIS_Ok )   CALL oasis_abort ( ncomp_id, 'cpl_define', 'Failure in oasis_enddef') 
    297309      ! 
     310      IF ( ltmp_wapatch ) THEN 
     311         nldi = nldi_save   ;   nlei = nlei_save 
     312         nldj = nldj_save   ;   nlej = nlej_save 
     313      ENDIF 
    298314   END SUBROUTINE cpl_define 
    299315    
    … …  
    313329      INTEGER                                   ::   jc,jm     ! local loop index 
    314330      !!-------------------------------------------------------------------- 
     331      ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define 
     332      IF ( ltmp_wapatch ) THEN 
     333         nldi_save = nldi   ;   nlei_save = nlei 
     334         nldj_save = nldj   ;   nlej_save = nlej 
     335         IF( nimpp           ==      1 ) nldi = 1 
     336         IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi 
     337         IF( njmpp           ==      1 ) nldj = 1 
     338         IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
     339      ENDIF 
    315340      ! 
    316341      ! snd data to OASIS3 
    … …  
    341366         ENDDO 
    342367      ENDDO 
     368      IF ( ltmp_wapatch ) THEN 
     369         nldi = nldi_save   ;   nlei = nlei_save 
     370         nldj = nldj_save   ;   nlej = nlej_save 
     371      ENDIF 
    343372      ! 
    344373    END SUBROUTINE cpl_snd 
    … …  
    361390      LOGICAL                                   ::   llaction, llfisrt 
    362391      !!-------------------------------------------------------------------- 
     392      ! patch to restore wraparound rows in cpl_send, cpl_rcv, cpl_define 
     393      IF ( ltmp_wapatch ) THEN 
     394         nldi_save = nldi   ;   nlei_save = nlei 
     395         nldj_save = nldj   ;   nlej_save = nlej 
     396      ENDIF 
    363397      ! 
    364398      ! receive local data from OASIS3 on every process 
    … …  
    367401      ! 
    368402      DO jc = 1, srcv(kid)%nct 
     403         IF ( ltmp_wapatch ) THEN 
     404            IF( nimpp           ==      1 ) nldi = 1 
     405            IF( nimpp + jpi - 1 == jpiglo ) nlei = jpi 
     406            IF( njmpp           ==      1 ) nldj = 1 
     407            IF( njmpp + jpj - 1 == jpjglo ) nlej = jpj 
     408         ENDIF 
    369409         llfisrt = .TRUE. 
    370410 
    … …  
    408448         ENDDO 
    409449 
     450         IF ( ltmp_wapatch ) THEN 
     451            nldi = nldi_save   ;   nlei = nlei_save 
     452            nldj = nldj_save   ;   nlej = nlej_save 
     453         ENDIF 
    410454         !--- Fill the overlap areas and extra hallows (mpp) 
    411455         !--- check periodicity conditions (all cases) 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/cyclone.F90

    r9950 r10322  
    3939#  include "vectopt_loop_substitute.h90" 
    4040   !!---------------------------------------------------------------------- 
    41    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     41   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/fldread.F90

    r9950 r10322  
    125125   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    126126   !! $Id$ 
    127    !! Software governed by the CeCILL licence     (./LICENSE) 
     127   !! Software governed by the CeCILL license (see ./LICENSE) 
    128128   !!---------------------------------------------------------------------- 
    129129CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/geo2ocean.F90

    r9950 r10322  
    5555   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5656   !! $Id$ 
    57    !! Software governed by the CeCILL licence     (./LICENSE) 
     57   !! Software governed by the CeCILL license (see ./LICENSE) 
    5858   !!---------------------------------------------------------------------- 
    5959CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/ocealb.F90

    • Property svn:keywords set to Id
    r9950 r10322  
    2222   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2323   !! $Id$ 
    24    !! Software governed by the CeCILL licence     (./LICENSE) 
     24   !! Software governed by the CeCILL license (see ./LICENSE) 
    2525   !!---------------------------------------------------------------------- 
    2626CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbc_ice.F90

    r9950 r10322  
    109109   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    110110   !! $Id$ 
    111    !! Software governed by the CeCILL licence     (./LICENSE) 
     111   !! Software governed by the CeCILL license (see ./LICENSE) 
    112112   !!---------------------------------------------------------------------- 
    113113CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbc_oce.F90

    r9950 r10322  
    154154   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    155155   !! $Id$ 
    156    !! Software governed by the CeCILL licence     (./LICENSE) 
     156   !! Software governed by the CeCILL license (see ./LICENSE) 
    157157   !!---------------------------------------------------------------------- 
    158158CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcapr.F90

    r9950 r10322  
    4141 
    4242   !!---------------------------------------------------------------------- 
    43    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     43   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4444   !! $Id$ 
    45    !! Software governed by the CeCILL licence     (./LICENSE) 
     45   !! Software governed by the CeCILL license (see ./LICENSE) 
    4646   !!---------------------------------------------------------------------- 
    4747CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcblk.F90

    • Property svn:keywords set to Id
    r9950 r10322  
    136136   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    137137   !! $Id$ 
    138    !! Software governed by the CeCILL licence     (./LICENSE) 
     138   !! Software governed by the CeCILL license (see ./LICENSE) 
    139139   !!---------------------------------------------------------------------- 
    140140CONTAINS 
    … …  
    239239      !drag coefficient read from wave model definable only with mfs bulk formulae and core  
    240240         ELSEIF (ln_cdgw .AND. .NOT. ln_NCAR )       THEN        
    241              CALL ctl_stop( 'drag coefficient read from wave model definable only with mfs bulk formulae and core') 
     241             CALL ctl_stop( 'drag coefficient read from wave model definable only with NCAR and CORE bulk formulae') 
    242242         ELSEIF (ln_stcor .AND. .NOT. ln_sdw)                             THEN 
    243243             CALL ctl_stop( 'Stokes-Coriolis term calculated only if activated Stokes Drift ln_sdw=T') 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcblk_algo_coare.F90

    • Property svn:keywords set to Id

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcblk_algo_coare3p5.F90

    • Property svn:keywords set to Id

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcblk_algo_ecmwf.F90

    • Property svn:keywords set to Id

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcblk_algo_ncar.F90

    • Property svn:keywords set to Id
    r9570 r10322  
    149149      Ch = 1.e-3*sqrt_Cd_n10*(18.*stab + 32.7*(1. - stab)) 
    150150      stab = sqrt_Cd_n10   ! Temporaty array !!! stab == SQRT(Cd) 
     151  
     152      IF( ln_cdgw )   Cen = Ce  ; Chn = Ch 
    151153 
    152154      !! Initializing values at z_u with z_t values: 
    … …  
    186188         IF( ln_cdgw ) THEN      ! surface wave case 
    187189            stab = vkarmn / ( vkarmn / sqrt_Cd_n10 - ztmp2 )  ! (stab == SQRT(Cd)) 
    188             Cd      = stab * stab 
     190            Cd   = stab * stab 
     191            ztmp0 = (LOG(zu/10.) - zpsi_h_u) / vkarmn / sqrt_Cd_n10 
     192            ztmp2 = stab / sqrt_Cd_n10   ! (stab == SQRT(Cd)) 
     193            ztmp1 = 1. + Chn * ztmp0      
     194            Ch    = Chn * ztmp2 / ztmp1  ! L&Y 2004 eq. (10b) 
     195            ztmp1 = 1. + Cen * ztmp0 
     196            Ce    = Cen * ztmp2 / ztmp1  ! L&Y 2004 eq. (10c) 
     197 
    189198         ELSE 
    190199            ! Update neutral wind speed at 10m and neutral Cd at 10m (L&Y 2004 eq. 9a)... 
    … …  
    205214            Cd      = ztmp0 / ( ztmp1*ztmp1 ) 
    206215            stab = SQRT( Cd ) ! Temporary array !!! (stab == SQRT(Cd)) 
    207          ENDIF 
    208  
    209          ztmp0 = (LOG(zu/10.) - zpsi_h_u) / vkarmn / sqrt_Cd_n10 
    210          ztmp2 = stab / sqrt_Cd_n10   ! (stab == SQRT(Cd)) 
    211          ztmp1 = 1. + Cx_n10*ztmp0    ! (Cx_n10 == Ch_n10) 
    212          Ch  = Cx_n10*ztmp2 / ztmp1   ! L&Y 2004 eq. (10b) 
    213  
    214          Cx_n10  = 1.e-3 * (34.6 * sqrt_Cd_n10)  ! L&Y 2004 eq. (6b)    ! Cx_n10 == Ce_n10 
    215          Cen(:,:) = Cx_n10 
    216          ztmp1 = 1. + Cx_n10*ztmp0 
    217          Ce  = Cx_n10*ztmp2 / ztmp1  ! L&Y 2004 eq. (10c) 
     216 
     217            ztmp0 = (LOG(zu/10.) - zpsi_h_u) / vkarmn / sqrt_Cd_n10 
     218            ztmp2 = stab / sqrt_Cd_n10   ! (stab == SQRT(Cd)) 
     219            ztmp1 = 1. + Cx_n10*ztmp0    ! (Cx_n10 == Ch_n10) 
     220            Ch  = Cx_n10*ztmp2 / ztmp1   ! L&Y 2004 eq. (10b) 
     221 
     222            Cx_n10  = 1.e-3 * (34.6 * sqrt_Cd_n10)  ! L&Y 2004 eq. (6b)    ! Cx_n10 == Ce_n10 
     223            Cen(:,:) = Cx_n10 
     224            ztmp1 = 1. + Cx_n10*ztmp0 
     225            Ce  = Cx_n10*ztmp2 / ztmp1  ! L&Y 2004 eq. (10c) 
     226            ENDIF 
    218227         ! 
    219228      END DO 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbccpl.F90

    r9950 r10322  
    202202   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    203203   !! $Id$ 
    204    !! Software governed by the CeCILL licence     (./LICENSE) 
     204   !! Software governed by the CeCILL license (see ./LICENSE) 
    205205   !!---------------------------------------------------------------------- 
    206206CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcdcy.F90

    r9950 r10322  
    3131 
    3232   !!---------------------------------------------------------------------- 
    33    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     33   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3434   !! $Id$ 
    35    !! Software governed by the CeCILL licence     (./LICENSE) 
     35   !! Software governed by the CeCILL license (see ./LICENSE) 
    3636   !!---------------------------------------------------------------------- 
    3737CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcflx.F90

    r9950 r10322  
    4040#  include "vectopt_loop_substitute.h90" 
    4141   !!---------------------------------------------------------------------- 
    42    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     42   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4343   !! $Id$ 
    44    !! Software governed by the CeCILL licence     (./LICENSE) 
     44   !! Software governed by the CeCILL license (see ./LICENSE) 
    4545   !!---------------------------------------------------------------------- 
    4646CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcfwb.F90

    r9950 r10322  
    4444   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4545   !! $Id$ 
    46    !! Software governed by the CeCILL licence     (./LICENSE) 
     46   !! Software governed by the CeCILL license (see ./LICENSE) 
    4747   !!---------------------------------------------------------------------- 
    4848CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcice_cice.F90

    r9950 r10322  
    8989 
    9090   !!---------------------------------------------------------------------- 
    91    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     91   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    9292   !! $Id$ 
    93    !! Software governed by the CeCILL licence     (./LICENSE) 
     93   !! Software governed by the CeCILL license (see ./LICENSE) 
    9494   !!---------------------------------------------------------------------- 
    9595CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcice_if.F90

    r9950 r10322  
    3838   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3939   !! $Id$ 
    40    !! Software governed by the CeCILL licence     (./LICENSE) 
     40   !! Software governed by the CeCILL license (see ./LICENSE) 
    4141   !!---------------------------------------------------------------------- 
    4242CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcisf.F90

    r9950 r10322  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcmod.F90

    r9950 r10322  
    6969 
    7070   !!---------------------------------------------------------------------- 
    71    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     71   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 
    … …  
    157157         WRITE(numout,*) '               wave modified ocean stress component ln_tauw       = ', ln_tauw 
    158158         WRITE(numout,*) '               Stokes coriolis term                 ln_stcor      = ', ln_stcor 
    159          WRITE(numout,*) '               neutral drag coefficient (CORE, MFS) ln_cdgw       = ', ln_cdgw 
    160       ENDIF 
    161       ! 
     159         WRITE(numout,*) '               neutral drag coefficient (CORE,NCAR) ln_cdgw       = ', ln_cdgw 
     160      ENDIF 
     161      ! 
     162      IF( .NOT.ln_wave ) THEN 
     163         ln_sdw = .false. ; ln_cdgw = .false. ; ln_tauwoc = .false. ; ln_tauw = .false. ; ln_stcor = .false. 
     164      ENDIF  
    162165      IF( ln_sdw ) THEN 
    163166         IF( .NOT.(nn_sdrift==jp_breivik_2014 .OR. nn_sdrift==jp_li_2017 .OR. nn_sdrift==jp_peakfr) ) & 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcrnf.F90

    r9950 r10322  
    7171   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7272   !! $Id$ 
    73    !! Software governed by the CeCILL licence     (./LICENSE) 
     73   !! Software governed by the CeCILL license (see ./LICENSE) 
    7474   !!---------------------------------------------------------------------- 
    7575CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcssm.F90

    r9950 r10322  
    3434   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3535   !! $Id$ 
    36    !! Software governed by the CeCILL licence     (./LICENSE) 
     36   !! Software governed by the CeCILL license (see ./LICENSE) 
    3737   !!---------------------------------------------------------------------- 
    3838CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcssr.F90

    r9950 r10322  
    4949   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    5050   !! $Id$ 
    51    !! Software governed by the CeCILL licence     (./LICENSE) 
     51   !! Software governed by the CeCILL license (see ./LICENSE) 
    5252   !!---------------------------------------------------------------------- 
    5353CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbctide.F90

    r9950 r10322  
    3535   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3636   !! $Id$ 
    37    !! Software governed by the CeCILL licence     (./LICENSE) 
     37   !! Software governed by the CeCILL license (see ./LICENSE) 
    3838   !!---------------------------------------------------------------------- 
    3939CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/sbcwave.F90

    r10012 r10322  
    7474#  include "vectopt_loop_substitute.h90" 
    7575   !!---------------------------------------------------------------------- 
    76    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     76   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    7777   !! $Id$ 
    78    !! Software governed by the CeCILL licence     (./LICENSE) 
     78   !! Software governed by the CeCILL license (see ./LICENSE) 
    7979   !!---------------------------------------------------------------------- 
    8080CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/tide.h90

    • Property svn:keywords set to Id

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/tide_mod.F90

    r9950 r10322  
    3434 
    3535   !!---------------------------------------------------------------------- 
    36    !! NEMO/OCE 4.0 , NEMO Consortium (2018)  
     36   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    3737   !! $Id$ 
    38    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
     38   !! Software governed by the CeCILL license (see ./LICENSE) 
    3939   !!---------------------------------------------------------------------- 
    4040CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/tideini.F90

    r9950 r10322  
    4141   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    4242   !! $Id$ 
    43    !! Software governed by the CeCILL licence     (./LICENSE) 
     43   !! Software governed by the CeCILL license (see ./LICENSE) 
    4444   !!---------------------------------------------------------------------- 
    4545CONTAINS 

  • NEMO/branches/UKMO/dev_r9950_GO8_package/src/OCE/SBC/updtide.F90

    r9950 r10322  
    2323   !! NEMO/OCE 4.0 , NEMO Consortium (2018) 
    2424   !! $Id$ 
    25    !! Software governed by the CeCILL licence     (./LICENSE) 
     25   !! Software governed by the CeCILL license (see ./LICENSE) 
    2626   !!---------------------------------------------------------------------- 
    2727CONTAINS 
Note: See TracChangeset for help on using the changeset viewer.