Changeset 8166 for branches/UKMO

Timestamp:

2017-06-13T17:16:28+02:00 (7 years ago)

Author:

dancopsey

Message:

First attempt at getting the ocean to accept river runoff as a 1D array.

Location:

branches/UKMO/dev_r5518_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• cpl_oasis3.F90 (modified) (3 diffs)
• sbccpl.F90 (modified) (1 diff)

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

@@ -69 +69 @@
    INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields
    
+   INTEGER :: runoff_id
+   
    TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information
       LOGICAL               ::   laction   ! To be coupled or not
@@ -288 +290 @@
          ENDIF
       END DO
+      
+      ! Define river runoff
+      CALL oasis_def_var (runoff_id, 'runoffo', id_part   , (/ 1, 0 /),   &
+                     &                OASIS_In           , (/ 10 /) , OASIS_REAL, nerror )
+      IF ( nerror /= OASIS_Ok ) THEN
+          WRITE(numout,*) 'Failed to define transient runoffo'
+          CALL oasis_abort ( runoff_id, 'cpl_define', 'Failure in oasis_def_var' )
+      ENDIF
       
       !------------------------------------------------------------------
@@ -415 +425 @@
       !
    END SUBROUTINE cpl_rcv
+   
+   SUBROUTINE runoff_rcv(kstep)
+      
+      INTEGER                   , INTENT(in   ) ::   kstep     ! ocean time-step in seconds
+      
+      INTEGER  ::   kinfo                  ! OASIS3 info argument    
+      REAL(wp) ::   runoff(10)             ! River runoff. One value per river.
+   
+      ! Get the river runoff sent by the atmosphere
+      CALL oasis_get ( runoff_id, kstep, runoff, kinfo )
+      WRITE(numout,*)' River runoff = ', runoff
+      WRITE(numout,*)' kinfo = ', kinfo
+   
+   
+   END SUBROUTINE runoff_rcv
 
 

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

@@ -866 +866 @@
          IF( srcv(jn)%laction )   CALL cpl_rcv( jn, isec, frcv(jn)%z3, xcplmask(:,:,1:nn_cplmodel), nrcvinfo(jn) )
       END DO
+      
+      CALL runoff_rcv(isec)      
 
       !                                                      ! ========================= !