Changeset 4266

Timestamp:

2013-11-19T22:44:09+01:00 (10 years ago)

Author:

acc

Message:

Branch 2013/dev_r3858_NOC_ZTC, #863. Corrections to enable compilation of GYRE SETTE tests. GYRE tests passed

Location:

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC

Files:

• DIA/diawri.F90 (modified) (1 diff)
• DYN/dynspg_ts.F90 (modified) (1 diff)
• SBC/updtide.F90 (modified) (1 diff)

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DIA/diawri.F90

@@ -44 +44 @@
    USE diadimg         ! dimg direct access file format output
    USE diaar5, ONLY :   lk_diaar5
+   USE dynadv, ONLY :   ln_dynadv_vec
    USE iom
    USE ioipsl

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

@@ -1131 +1131 @@
    USE par_kind
    LOGICAL, PUBLIC, PARAMETER :: ln_bt_fw=.FALSE. ! Forward integration of barotropic sub-stepping
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   un_b, vn_b     ! declaration needed for compilation when "key_dynspg_ts" is not defined. Arrays never used or allocated
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   un_adv, vn_adv ! declaration needed for compilation when "key_dynspg_ts" is not defined. Arrays never used or allocated
-
 CONTAINS
    INTEGER FUNCTION dyn_spg_ts_alloc()    ! Dummy function

branches/2013/dev_r3858_NOC_ZTC/NEMOGCM/NEMO/OPA_SRC/SBC/updtide.F90

@@ -86 +86 @@
   !!----------------------------------------------------------------------
 CONTAINS
-  SUBROUTINE upd_tide( kt,kit )          ! Empty routine
-    INTEGER,INTENT (IN) :: kt, kit
+  SUBROUTINE upd_tide( kt, kit, kbaro, koffset )          ! Empty routine
+    INTEGER, INTENT(in)           ::   kt      !  integer  arg, dummy routine
+    INTEGER, INTENT(in), OPTIONAL ::   kit     !  optional arg, dummy routine
+    INTEGER, INTENT(in), OPTIONAL ::   kbaro   !  optional arg, dummy routine
+    INTEGER, INTENT(in), OPTIONAL ::   koffset !  optional arg, dummy routine
     WRITE(*,*) 'upd_tide: You should not have seen this print! error?', kt
   END SUBROUTINE upd_tide