Changeset 12675 for NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90

Timestamp:

2020-04-03T18:00:43+02:00 (4 years ago)

Author:

dancopsey

Message:

Fix compile errors.

File:

• NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90 (modified) (8 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_icesheet_and_river_coupling/src/OCE/SBC/cpl_rnf_1d.F90

@@ -19 +19 @@
    USE lib_mpp         ! MPP library
    USE iom
-   USE wrk_nemo        ! Memory allocation
    USE dom_oce         ! Domain sizes (for grid box area e1e2t)
    USE sbc_oce         ! Surface boundary condition: ocean fields
@@ -31 +30 @@
    
    TYPE, PUBLIC ::   RIVERS_DATA     !: Storage for river outflow data
-      INTEGER, POINTER, DIMENSION(:,:)    ::   river_number       !: River outflow number
-      REAL(wp), POINTER, DIMENSION(:)     ::   river_area         ! 1D array listing areas of each river outflow (m2)
-      COMPLEX(wp), POINTER, DIMENSION(:)  ::   river_area_c       ! Comlex version of river_area for use in bit reproducible sums (m2)
+      INTEGER, ALLOCATABLE, DIMENSION(:,:)    ::   river_number       !: River outflow number
+      REAL(wp), ALLOCATABLE, DIMENSION(:)     ::   river_area         ! 1D array listing areas of each river outflow (m2)
+      COMPLEX(wp), ALLOCATABLE, DIMENSION(:)  ::   river_area_c       ! Comlex version of river_area for use in bit reproducible sums (m2)
    END TYPE RIVERS_DATA
    
@@ -60 +59 @@
       INTEGER                                   ::   ii, jj, rr          !: Loop indices
       INTEGER                                   ::   max_river
-      REAL(wp), POINTER, DIMENSION(:,:)         ::   river_number        ! 2D array containing the river outflow numbers
+      REAL(wp), DIMENSION(jpi,jpj)              ::   river_number        ! 2D array containing the river outflow numbers
       
       NAMELIST/nam_cpl_rnf_1d/file_riv_number, nn_cpl_river, ln_print_river_info
       !!----------------------------------------------------------------------
 
-      IF( nn_timing == 1 ) CALL timing_start('cpl_rnf_1d_init')
+      IF( ln_timing ) CALL timing_start('cpl_rnf_1d_init')
       
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'cpl_rnf_1d_init : initialization of river runoff coupling'
       IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~'
-      IF(lwp .AND. lflush) CALL flush(numout)
+      IF(lwp) CALL flush(numout)
       
       REWIND(numnam_cfg)
@@ -76 +75 @@
       ! Read the namelist
       READ  ( numnam_ref, nam_cpl_rnf_1d, IOSTAT = ios, ERR = 901)
-901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_cpl_rnf_1d in reference namelist', lwp )
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_cpl_rnf_1d in reference namelist' )
       READ  ( numnam_cfg, nam_cpl_rnf_1d, IOSTAT = ios, ERR = 902 )
-902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_cpl_rnf_1d in configuration namelist', lwp )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'nam_cpl_rnf_1d in configuration namelist' )
       IF(lwm .AND. nprint > 2) WRITE ( numond, nam_cpl_rnf_1d )
 
@@ -88 +87 @@
       IF(lwp) WRITE(numout,*) '             Print river information = ',ln_print_river_info
       IF(lwp) WRITE(numout,*) ' '
-      IF(lwp .AND. lflush) CALL flush(numout)
-      
+      IF(lwp) CALL flush(numout)
+
       ! Assign space for river numbers
       ALLOCATE( rivers%river_number( jpi, jpj ) )
-      CALL wrk_alloc( jpi, jpj, river_number )
       
       ! Read the river numbers from netcdf file
@@ -113 +111 @@
       IF ( ln_print_river_info .AND. lwp) THEN
          WRITE(numout,*) 'Maximum river number in input file = ',max_river
-         IF(lflush) CALL flush(numout)
+         CALL flush(numout)
       END IF
       
@@ -132 +130 @@
       
       ! Use mpp_sum to add together river areas on other processors
-      CALL mpp_sum( rivers%river_area_c, nn_cpl_river )
+      CALL mpp_sum( 'cpl_rnf_1d', rivers%river_area_c )
       
       ! Convert from complex number to real
@@ -142 +140 @@
       IF ( ln_print_river_info .AND. lwp) THEN
         WRITE(numout,*) 'Area of rivers 1 to 10 are ',rivers%river_area(1:10)
-        IF(lflush) CALL flush(numout)
+        CALL flush(numout)
       END IF