Changeset 10722 for branches/UKMO/dev_r5518_DMP_TOOLS/NEMOGCM/TOOLS/DMP_TOOLS

Timestamp:

2019-02-25T15:19:53+01:00 (5 years ago)

Author:

jenniewaters

Message:

Changes to make sure original functionality works correctly.

Location:

branches/UKMO/dev_r5518_DMP_TOOLS/NEMOGCM/TOOLS/DMP_TOOLS/src

Files:

• coast_dist.F90 (modified) (3 diffs)
• make_dmp_file.F90 (modified) (3 diffs)

branches/UKMO/dev_r5518_DMP_TOOLS/NEMOGCM/TOOLS/DMP_TOOLS/src/coast_dist.F90

@@ -9 +9 @@
    CONTAINS
 
-   SUBROUTINE coast_dist_weight( presto, ln_read , klev ) 
+   SUBROUTINE coast_dist_weight( presto, zdct, ln_read , klev, ln_distcoast_calc ) 
       !!----------------------------------------------------------------------
       !!                 *** ROUTINE coast_dist_weight ***
@@ -20 +20 @@
       IMPLICIT NONE
       REAL(wp), DIMENSION(jpi,jpj), INTENT( inout ) :: presto
+      REAL(wp), DIMENSION(jpi,jpj), INTENT( inout ) :: zdct
       LOGICAL, INTENT( in )                         :: ln_read
       INTEGER, INTENT( in )                         :: klev
+      LOGICAL, INTENT( inout )                      :: ln_distcoast_calc
       REAL(wp), DIMENSION(jpi,jpj) :: zdct
       REAL(wp) :: zinfl = 1000.e3_wp  ! Distance of influence of coast line (could be
@@ -37 +39 @@
       ELSE
 
-         IF (klev == 1 ) THEN ! Since only a the surface distance to coast is used, only calculate once.
+         IF (ln_distcoast_calc ) THEN ! Since only the surface distance to coast is used, only calculate once.
             CALL cofdis( zdct )
+            ln_distcoast_calc=.false.
          ENDIF
 

branches/UKMO/dev_r5518_DMP_TOOLS/NEMOGCM/TOOLS/DMP_TOOLS/src/make_dmp_file.F90

@@ -32 +32 @@
   CHARACTER(LEN=200) :: outfile = 'resto.nc'     ! output file
   REAL(wp) :: zlat, zlat2, zlat0
+  LOGICAL  :: ln_distcoast_calc                  ! logical for calculating the distance
+                                                 ! to coast on the first depth.
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: zdct! distance to coast field
 
   ! Read namelist
@@ -48 +51 @@
   WRITE(numout, *) 'jpk = ',jpk
 
+  ln_distcoast_calc=.true.
+
   ALLOCATE( resto(jpi, jpj) )
+  ALLOCATE( zdct(jpi, jpj) )
 
   !Create output file
@@ -94 +100 @@
            IF (ln_coast) THEN
               ! Reduce damping in vicinity of coastlines
-              CALL coast_dist_weight(resto, ln_readdistcoast, jk)
+              CALL coast_dist_weight(resto, zdct, ln_readdistcoast, jk, ln_distcoast_calc)
            ENDIF
         ENDIF