Changeset 11062

Timestamp:

2019-05-28T13:06:01+02:00 (6 years ago)

Author:

dancopsey

Message:

Fix compile issues for when I am running GO6+MEDUSA.

File:

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

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

@@ -57 +57 @@
 #if defined key_oasis3
    USE mod_oasis, ONLY : OASIS_Sent, OASIS_ToRest, OASIS_SentOut, OASIS_ToRestOut
-#else
-   INTEGER                    ::   OASIS_Sent        = -1
-   INTEGER                    ::   OASIS_SentOut     = -1
-   INTEGER                    ::   OASIS_ToRest      = -1
-   INTEGER                    ::   OASIS_ToRestOut   = -1
 #endif
 
@@ -164 +159 @@
    REAL(wp), PARAMETER :: dms_unit_conv = 1.0e+6      ! Coversion factor to get outgong DMS in standard units for coupling
                                                  ! i.e. specifically nmol/L (= umol/m3)
+
+#if ! defined key_oasis3
+   ! Dummy variables to enable compilation when oasis3 is not being used
+   INTEGER                    ::   OASIS_Sent        = -1
+   INTEGER                    ::   OASIS_SentOut     = -1
+   INTEGER                    ::   OASIS_ToRest      = -1
+   INTEGER                    ::   OASIS_ToRestOut   = -1
+#endif
 
    !                                                         !!** namelist namsbc_cpl **
@@ -2367 +2370 @@
          IF( ssnd(jps_fice)%laction )   CALL cpl_snd( jps_fice, isec, ztmp3, info )
 
+#if defined key_lim2 || defined key_cice
          ! If this coupling was successful then save ice fraction for use between coupling points.
          ! This is needed for some calculations where the ice fraction at the last coupling point
@@ -2376 +2380 @@
            ENDIF
          ENDIF
+#endif
          
       ENDIF