Changeset 11914 for NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/SBC/sbcmod.F90

Timestamp:

2019-11-15T16:21:47+01:00 (4 years ago)

Author:

dancopsey

Message:

Merging in the rest of the NEMO4 GC coupling branch up to revision 11446

File:

• NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/SBC/sbcmod.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/SBC/sbcmod.F90

@@ -291 +291 @@
       !                             !* OASIS initialization
       !
-      IF( lk_oasis ) THEN
-         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 
-         CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step
-                                       !                      (2) the use of nn_fsbc
-      ENDIF
+      IF( lk_oasis )   CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step
+      !                                              !                      (2) the use of nn_fsbc
       !     nn_fsbc initialization if OPA-SAS coupling via OASIS
       !     SAS time-step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly