Changeset 10179 for NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src

Timestamp:

2018-10-08T14:47:55+02:00 (6 years ago)

Author:

smasson

Message:

dev_r10164_HPC09_ESIWACE_PREP_MERGE: action 4a: add si3 in BENCH, see #2133

Location:

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE

Files:

• LBC/mpp_lnk_generic.h90 (modified) (2 diffs)
• SBC/sbcssm.F90 (modified) (2 diffs)

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/LBC/mpp_lnk_generic.h90

@@ -155 +155 @@
          IF ( ncom_stp == nit000 ) THEN
             IF( .NOT. ALLOCATED( ncomm_sequence) ) THEN
-               ALLOCATE( ncomm_sequence(1000,2), STAT=ierr )
+               ALLOCATE( ncomm_sequence(2000,2), STAT=ierr )
                IF( ierr /= 0 ) CALL ctl_stop( 'STOP', 'lnk_generic, cannot allocate ncomm_sequence' )
-               ALLOCATE( crname(1000), STAT=ierr )
+               ALLOCATE( crname(2000), STAT=ierr )
                IF( ierr /= 0 ) CALL ctl_stop( 'STOP', 'lnk_generic, cannot allocate crname' )
             ENDIF
             n_sequence = n_sequence + 1
-            IF( n_sequence > 1000 ) CALL ctl_stop( 'STOP', 'lnk_generic, increase ncomm_sequence first dimension' )
+            IF( n_sequence > 2000 ) CALL ctl_stop( 'STOP', 'lnk_generic, increase ncomm_sequence first dimension' )
             ncomm_sequence(n_sequence,1) = ipk*ipl   ! size of 3rd and 4th dimensions
             ncomm_sequence(n_sequence,2) = ipf       ! number of arrays to be treated (multi)
@@ -172 +172 @@
                WRITE(numout,*) ' -----------------------------------------------'
                WRITE(numout,*) ' '
-               WRITE(numout,'(A,I3)') ' Exchanged halos : ', n_sequence
+               WRITE(numout,'(A,I4)') ' Exchanged halos : ', n_sequence
                jj = 0; jk = 0; jf = 0; jh = 0
                DO ji = 1, n_sequence

NEMO/branches/2018/dev_r10164_HPC09_ESIWACE_PREP_MERGE/src/OCE/SBC/sbcssm.F90

@@ -18 +18 @@
    USE sbcapr         ! surface boundary condition: atmospheric pressure
    USE eosbn2         ! equation of state and related derivatives
+   USE traqsr, ONLY: ln_traqsr
    !
    USE in_out_manager ! I/O manager
@@ -253 +254 @@
       ENDIF
       !
+      IF( .NOT. ln_traqsr )   fraqsr_1lev(:,:) = 1._wp   ! default definition: qsr 100% in the fisrt level 
+      !
       IF( lwxios.AND.nn_fsbc > 1 ) THEN
          CALL iom_set_rstw_var_active('nn_fsbc')