Changeset 13258 for NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/OCE/SBC/geo2ocean.F90

Timestamp:

2020-07-07T12:23:18+02:00 (4 years ago)

Author:

rblod

Message:

#2129 : merge branch CMEMS with trunk r13327

Location:

NEMO/branches/2020/dev_r12973_AGRIF_CMEMS

Files:

• . (modified) (1 prop)
• src/OCE/SBC/geo2ocean.F90 (modified) (1 diff)

NEMO/branches/2020/dev_r12973_AGRIF_CMEMS

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools_dev_r12970_AGRIF_CMEMS            tools
+^/utils/tools/@HEAD           tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools_dev_r12970_AGRIF_CMEMS            tools
+^/utils/tools/@HEAD           tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM

NEMO/branches/2020/dev_r12973_AGRIF_CMEMS/src/OCE/SBC/geo2ocean.F90

@@ -272 +272 @@
       ! =========================== !
       !           ! lateral boundary cond.: T-, U-, V-, F-pts, sgn
-      CALL lbc_lnk_multi( 'geo2ocean', gcost, 'T', -1., gsint, 'T', -1., gcosu, 'U', -1., gsinu, 'U', -1., & 
-                      &   gcosv, 'V', -1., gsinv, 'V', -1., gcosf, 'F', -1., gsinf, 'F', -1.  )
+      CALL lbc_lnk_multi( 'geo2ocean', gcost, 'T', -1.0_wp, gsint, 'T', -1.0_wp, gcosu, 'U', -1.0_wp, gsinu, 'U', -1.0_wp, & 
+                      &   gcosv, 'V', -1.0_wp, gsinv, 'V', -1.0_wp, gcosf, 'F', -1.0_wp, gsinf, 'F', -1.0_wp  )
       !
    END SUBROUTINE angle

@@ -2 +2 @@
 ^/utils/build/makenemo@HEAD   makenemo
 ^/utils/build/mk@HEAD         mk
-^/utils/tools_dev_r12970_AGRIF_CMEMS            tools
+^/utils/tools/@HEAD           tools
 ^/vendors/AGRIF/dev_r12970_AGRIF_CMEMS      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM