Changeset 11452 for branches/UKMO

Timestamp:

2019-08-19T13:28:30+02:00 (5 years ago)

Author:

jcastill

Message:

Changes as in the original branch, plus one bug fix in oce.F90, plus changes to run with the branch but in uncoupled mode - although this is not complete yet

Location:

branches/UKMO/r6232_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC

Files:

• cpl_oasis3.F90 (modified) (7 diffs)
• cpl_rnf_1d.F90 (added)
• sbccpl.F90 (modified) (9 diffs)
• sbcice_cice.F90 (modified) (1 diff)

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

@@ -24 +24 @@
    !!   cpl_finalize : finalize the coupled mode communication
    !!----------------------------------------------------------------------
-#if defined key_oasis3
+#if defined key_oasis3 || defined key_oasis3mct
    USE mod_oasis                    ! OASIS3-MCT module
 #endif
@@ -46 +46 @@
    INTEGER                    ::   ncomp_id          ! id returned by oasis_init_comp
    INTEGER                    ::   nerror            ! return error code
-#if ! defined key_oasis3
+#if ! defined key_oasis3 && ! defined key_oasis3mct
    ! OASIS Variables not used. defined only for compilation purpose
    INTEGER                    ::   OASIS_Out         = -1
@@ -69 +69 @@
    INTEGER, PUBLIC, PARAMETER ::   nmaxcpl=5    ! Maximum number of coupling fields
    
+   INTEGER, PUBLIC            ::   nn_cpl_river=0 ! Maximum number of rivers being passed through the coupler
+   INTEGER, PUBLIC            ::   runoff_id      ! OASIS coupling id used in oasis_get command
+
    TYPE, PUBLIC ::   FLD_CPL               !: Type for coupling field information
       LOGICAL               ::   laction   ! To be coupled or not
@@ -136 +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_rnf_1d ! Partition for river runoff using 1D array
       INTEGER :: paral(5)       ! OASIS3 box partition
       INTEGER :: ishape(2,2)    ! shape of arrays passed to PSMILe
@@ -198 +202 @@
       CALL oasis_def_partition ( id_part, paral, nerror )
       !
+      ! Another partition is needed for river runoff when using 1D array
+      paral(1) = 0                                              ! serial partitioning
+      paral(2) = 0   
+      paral(3) = nn_cpl_river                                       ! size of array to couple
+      paral(4) = 0
+      paral(5) = 0
+
+      CALL oasis_def_partition ( id_part_rnf_1d, paral, nerror, nn_cpl_river )
       ! ... Announce send variables. 
       !
@@ -289 +301 @@
       END DO
       
+      ! Define coupled river runoff using 1D array
+      CALL oasis_def_var (runoff_id, 'runoffo', id_part_rnf_1d, (/ 1, 0 /),   &
+                     &                OASIS_In           , (/ 1, nn_cpl_river /) , 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
+
       !------------------------------------------------------------------
       ! End of definition phase
@@ -514 +534 @@
    END SUBROUTINE oasis_get_localcomm
 
-   SUBROUTINE oasis_def_partition(k1,k2,k3)
-      INTEGER     , INTENT(  out) ::  k1,k3
-      INTEGER     , INTENT(in   ) ::  k2(5)
+   SUBROUTINE oasis_def_partition(k1,k2,k3,k4)
+      INTEGER          , INTENT(  out) ::  k1,k3
+      INTEGER          , INTENT(in   ) ::  k2(5)
+      INTEGER, OPTIONAL, INTENT(in   ) ::  k4
       k1 = k2(1) ; k3 = k2(5)
       WRITE(numout,*) 'oasis_def_partition: Error you sould not be there...'

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

@@ -43 +43 @@
    USE eosbn2
    USE sbcrnf   , ONLY : l_rnfcpl
+   USE cpl_rnf_1d      ! Coupled runoff using 1D array
 #if defined key_cpl_carbon_cycle
    USE p4zflx, ONLY : oce_co2
@@ -401 +402 @@
       !                                                      ! ------------------------- !
       srcv(jpr_rnf   )%clname = 'O_Runoff'
-      IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) THEN
+      IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' .OR. TRIM( sn_rcv_rnf%cldes ) == 'coupled1d' ) THEN
          srcv(jpr_rnf)%laction = .TRUE.
          l_rnfcpl              = .TRUE.                      ! -> no need to read runoffs in sbcrnf
@@ -407 +408 @@
          IF(lwp) WRITE(numout,*)
          IF(lwp) WRITE(numout,*) '   runoffs received from oasis -> force ln_rnf = ', ln_rnf
+         ! Written here like this to allow merging with other branches (river mask)
+         IF( TRIM( sn_rcv_rnf%cldes ) == 'coupled' ) THEN
+           srcv(jpr_rnf)%laction = .TRUE.
+         ELSE
+           srcv(jpr_rnf)%laction = .FALSE.
+         ENDIF
       ENDIF
       !
@@ -761 +768 @@
          ENDIF
       ENDIF
+
+      ! Initialise 1D river outflow scheme
+      nn_cpl_river = 1
+      IF ( TRIM( sn_rcv_rnf%cldes ) == 'coupled1d' ) CALL cpl_rnf_1d_init   ! Coupled runoff using 1D array
 
       !
@@ -1072 +1083 @@
          !
          !                                                        ! runoffs and calving (added in emp)
-         IF( srcv(jpr_rnf)%laction )     rnf(:,:) = frcv(jpr_rnf)%z3(:,:,1)
+         IF( srcv(jpr_rnf)%laction )     rnf(:,:) = frcv(jpr_rnf)%z3(:,:,1)               
+         IF ( TRIM( sn_rcv_rnf%cldes ) == 'coupled1d' ) CALL cpl_rnf_1d_rcv( isec)
          IF( srcv(jpr_cal)%laction )     zemp(:,:) = zemp(:,:) - frcv(jpr_cal)%z3(:,:,1)
          
@@ -1331 +1343 @@
    
 
-   SUBROUTINE sbc_cpl_ice_flx( p_frld, palbi, psst, pist )
+   SUBROUTINE sbc_cpl_ice_flx( kt, p_frld, palbi, psst, pist )
       !!----------------------------------------------------------------------
       !!             ***  ROUTINE sbc_cpl_ice_flx  ***
@@ -1371 +1383 @@
       !!                   sprecip             solid precipitation over the ocean  
       !!----------------------------------------------------------------------
+      INTEGER, INTENT(in)           ::   kt          ! ocean model time step index
       REAL(wp), INTENT(in   ), DIMENSION(:,:)   ::   p_frld     ! lead fraction                [0 to 1]
       ! optional arguments, used only in 'mixed oce-ice' case
@@ -1384 +1397 @@
       !!----------------------------------------------------------------------
       !
+      INTEGER  ::   isec                   ! number of seconds since nit000 (assuming rdttra did not change since nit000)
+
       IF( nn_timing == 1 )  CALL timing_start('sbc_cpl_ice_flx')
       !
@@ -1432 +1447 @@
          CALL iom_put( 'calving_cea', frcv(jpr_cal)%z3(:,:,1) )
       ENDIF
+      isec = ( kt - nit000 ) * NINT( rdttra(1) )
+      CALL cpl_rnf_1d_rcv( isec)
 
       IF( ln_mixcpl ) THEN

branches/UKMO/r6232_new_runoff_coupling/NEMOGCM/NEMO/OPA_SRC/SBC/sbcice_cice.F90

@@ -139 +139 @@
             CALL cice_sbc_force(kt)
          ELSE IF ( ksbc == jp_purecpl ) THEN
-            CALL sbc_cpl_ice_flx( 1.0-fr_i  )
+            CALL sbc_cpl_ice_flx( kt, 1.0-fr_i  )
          ENDIF