Changeset 11436 for NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg

Timestamp:

2019-08-14T16:16:20+02:00 (5 years ago)

Author:

timgraham

Message:

Get rid of modification to sbc_cpl_init and sbc_cpl_alloc so that number of models is no longer hard coded in the latter. This must be leftover from CICE

Location:

NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/SBC

Files:

• sbccpl.F90 (modified) (2 diffs)
• sbcmod.F90 (modified) (1 diff)

NEMO/branches/UKMO/NEMO_4.0_GC_couple_pkg/src/OCE/SBC/sbccpl.F90

@@ -219 +219 @@
       ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init)
 #endif
-      !ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) )
-      ! Hardwire only two models as nn_cplmodel has not been read in
-      ! from the namelist yet.
-      ALLOCATE( xcplmask(jpi,jpj,0:2) , STAT=ierr(3) )   
+      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) )
       !
       IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(4) ) 
@@ -336 +333 @@
 
       !                                   ! allocate sbccpl arrays
-      !IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
+      IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
      
       ! ================================ !

NEMO/branches/UKMO/NEMO_4.0_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