Changeset 13311 for NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/SBC/cpl_oasis3.F90

Timestamp:

2020-07-16T15:27:24+02:00 (4 years ago)

Author:

frrh

Message:

Save dev changes for concurrent LFRIC + GO8 running

File:

• NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/SBC/cpl_oasis3.F90 (modified) (6 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/SBC/cpl_oasis3.F90

@@ -95 +95 @@
 CONTAINS
 
-   SUBROUTINE cpl_init( cd_modname, kl_comm )
+   SUBROUTINE cpl_init( cd_modname, kl_comm ) 
+
       !!-------------------------------------------------------------------
       !!             ***  ROUTINE cpl_init  ***
@@ -104 +105 @@
       !! ** Method  :   OASIS3 MPI communication 
       !!--------------------------------------------------------------------
+      USE sbc_oce , ONLY :   ln_cpl
       CHARACTER(len = *), INTENT(in   ) ::   cd_modname   ! model name as set in namcouple file
       INTEGER           , INTENT(  out) ::   kl_comm      ! local communicator of the model
@@ -114 +116 @@
       ! 1st Initialize the OASIS system for the application
       !------------------------------------------------------------------
-      CALL oasis_init_comp ( ncomp_id, TRIM(cd_modname), nerror )
+      CALL oasis_init_comp ( ncomp_id, TRIM(cd_modname), nerror, ln_cpl )
       IF ( nerror /= OASIS_Ok ) &
          CALL oasis_abort (ncomp_id, 'cpl_init', 'Failure in oasis_init_comp')
@@ -530 +532 @@
       !!----------------------------------------------------------------------
       !
-      DEALLOCATE( exfld )
+      IF (ALLOCATED(exfld)) DEALLOCATE( exfld )
+
       IF (nstop == 0) THEN
          CALL oasis_terminate( nerror )         
@@ -545 +548 @@
    !!----------------------------------------------------------------------
 
-   SUBROUTINE oasis_init_comp(k1,cd1,k2)
+   SUBROUTINE oasis_init_comp(k1,cd1,k2,l1)
       CHARACTER(*), INTENT(in   ) ::  cd1
       INTEGER     , INTENT(  out) ::  k1,k2
@@ -554 +557 @@
    SUBROUTINE oasis_abort(k1,cd1,cd2)
       INTEGER     , INTENT(in   ) ::  k1
-      CHARACTER(*), INTENT(in   ) ::  cd1,cd2
+      CHARACTER(*), INTENT(in   ) ::  cd1,cd2     
+      LOGICAL     , OPTIONAL,  INTENT(in   ) ::  l1
       WRITE(numout,*) 'oasis_abort: Error you sould not be there...', cd1, cd2
    END SUBROUTINE oasis_abort