Changeset 8433 for branches/UKMO

Timestamp:

2017-08-10T17:33:56+02:00 (7 years ago)

Author:

dancopsey

Message:

Added partition information for river runoff coupling.

Location:

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC

Files:

• SBC/cpl_oasis3.F90 (modified) (3 diffs)
• oce.F90 (modified) (1 diff)

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

@@ -139 +139 @@
       INTEGER, INTENT(in) ::   kcplmodel      ! Maximum number of models to/from which NEMO is potentialy sending/receiving data
       !
-      INTEGER :: id_part
+      INTEGER :: id_part        ! Partition for all 2D model fields to be coupled
+      INTEGER :: id_part_r      ! Partition for river runoff
       INTEGER :: paral(5)       ! OASIS3 box partition
       INTEGER :: ishape(2,2)    ! shape of arrays passed to PSMILe
@@ -200 +201 @@
       
       CALL oasis_def_partition ( id_part, paral, nerror )
+      
+      ! Another partition is needed for river runoff
+      
+      paral(1) = 0                                              ! serial partitioning
+      paral(2) = 0   
+      paral(3) = 10                                             ! size of array to couple
+      paral(4) = 0
+      paral(5) = 0
+      
+      CALL oasis_def_partition ( id_part_r, paral, nerror )
+      
       !
       ! ... Announce send variables. 
@@ -293 +305 @@
       
       ! Define river runoff
-      CALL oasis_def_var (runoff_id, 'runoffo', id_part   , (/ 1, 0 /),   &
+      CALL oasis_def_var (runoff_id, 'runoffo', id_part_r   , (/ 1, 0 /),   &
                      &                OASIS_In           , (/ 1, 10 /) , OASIS_REAL, nerror )
       IF ( nerror /= OASIS_Ok ) THEN

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/oce.F90

@@ -86 +86 @@
       !!----------------------------------------------------------------------
       !
+      ierr(5) = 0
       ALLOCATE( ub   (jpi,jpj,jpk)      , un   (jpi,jpj,jpk)      , ua(jpi,jpj,jpk)       ,     &
          &      vb   (jpi,jpj,jpk)      , vn   (jpi,jpj,jpk)      , va(jpi,jpj,jpk)       ,     &