Changeset 2888 for branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC

Timestamp:

2011-10-06T11:26:33+02:00 (13 years ago)

Author:

davestorkey

Message:

Move changes into updated BDY module and restore old OBC code.
(Full merge to take place next year).

Location:

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• fldread.F90 (modified) (2 diffs)
• sbcmod.F90 (modified) (2 diffs)

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC/fldread.F90

@@ -649 +649 @@
       !!                using a general mapping (for open boundaries)
       !!----------------------------------------------------------------------
-#if defined key_obc
-      USE obc_oce, ONLY:  dta_global         ! workspace to read in global data arrays
+#if defined key_bdy
+      USE bdy_oce, ONLY:  dta_global         ! workspace to read in global data arrays
 #endif 
 
@@ -669 +669 @@
       !!---------------------------------------------------------------------
             
-#if defined key_obc
+#if defined key_bdy
       dta_read => dta_global
 #endif

branches/2011/UKMO_MERCATOR_obc_bdy_merge/NEMOGCM/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -38 +38 @@
    USE sbcfwb           ! surface boundary condition: freshwater budget
    USE closea           ! closed sea
-   USE obc_par          ! for lk_obc
-   USE obcice_lim2      ! unstructured open boundary data  (obc_ice_lim_2 routine)
+   USE bdy_par          ! for lk_bdy
+   USE bdyice_lim2      ! unstructured open boundary data  (bdy_ice_lim_2 routine)
 
    USE prtctl           ! Print control                    (prt_ctl routine)
@@ -253 +253 @@
          !                                                      
       CASE(  2 )   ;       CALL sbc_ice_lim_2( kt, nsbc )            ! LIM-2 ice model
-         IF( lk_obc )      CALL obc_ice_lim_2( kt )                  ! OBC boundary condition
+         IF( lk_bdy )      CALL bdy_ice_lim_2( kt )                  ! BDY boundary condition
          !                                                     
       CASE(  3 )   ;       CALL sbc_ice_lim  ( kt, nsbc )            ! LIM-3 ice model