Changeset 9813 for branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90

Timestamp:

2018-06-19T21:54:00+02:00 (6 years ago)

Author:

antsia

Message:

delete iscplhsb, add iscpldiv and make the code readable

File:

• branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90 (modified) (4 diffs)

branches/UKMO/dev_isf_divg_corr_GO6_package_r9385/NEMOGCM/NEMO/OPA_SRC/DOM/iscplini.F90

@@ -28 +28 @@
    REAL(wp), PUBLIC                                        ::   rdt_iscpl
    !!                                                      !!* namsbc_iscpl namelist *
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:  ) ::   hdiv_iscpl
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::   htsc_iscpl
+   !!------array used for divergence correction
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:) ::  rhdivdiff
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:,:) ::  rhdivdiff_trac
+
    !! * Substitutions  
 #  include "domzgr_substitute.h90"  
@@ -43 +45 @@
       !!                ***  ROUTINE sbc_iscpl_alloc  ***
       !!----------------------------------------------------------------------
-      ALLOCATE( htsc_iscpl(jpi,jpj,jpk,jpts) , hdiv_iscpl(jpi,jpj,jpk) , STAT=iscpl_alloc )
+      ALLOCATE( rhdivdiff(jpi,jpj,jpk), rhdivdiff_trac(jpi,jpj,jpk,2), STAT=iscpl_alloc )
          !
       IF( lk_mpp          )   CALL mpp_sum ( iscpl_alloc )
@@ -51 +53 @@
    SUBROUTINE iscpl_init()
       INTEGER ::   ios           ! Local integer output status for namelist read
+      INTEGER :: ierr
       NAMELIST/namsbc_iscpl/nn_fiscpl,ln_hsb,nn_drown
       !!----------------------------------------------------------------------
@@ -83 +86 @@
       END IF
 
+      IF( iscpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'iscpl_init : unable to allocate arrays' )
+
    END SUBROUTINE iscpl_init