Changeset 10199

Timestamp:

2018-10-17T11:13:02+02:00 (6 years ago)

Author:

jenniewaters

Message:

Alllow a distance to coast file to be read in. Also modify code to prevent multiple calculations of the surface distance to coast.

Location:

branches/UKMO/dev_r5518_DMP_TOOLS/NEMOGCM/TOOLS/DMP_TOOLS

Files:

• namelist_orca025 (added)
• src/coast_dist.F90 (modified) (2 diffs)
• src/make_dmp_file.F90 (modified) (1 diff)
• src/utils.F90 (modified) (2 diffs)

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

@@ -9 +9 @@
    CONTAINS
 
-   SUBROUTINE coast_dist_weight( presto ) 
+   SUBROUTINE coast_dist_weight( presto, ln_read , klev ) 
       !!----------------------------------------------------------------------
       !!                 *** ROUTINE coast_dist_weight ***
@@ -20 +20 @@
       IMPLICIT NONE
       REAL(wp), DIMENSION(jpi,jpj), INTENT( inout ) :: presto
+      LOGICAL, INTENT( in )                         :: ln_read
+      INTEGER, INTENT( in )                         :: klev
       REAL(wp), DIMENSION(jpi,jpj) :: zdct
       REAL(wp) :: zinfl = 1000.e3_wp  ! Distance of influence of coast line (could be
                                   ! a namelist setting)
       INTEGER :: jj, ji           ! dummy loop indices
-      
-
-      CALL cofdis( zdct )
+      INTEGER :: ncin, tdist_id
+
+      IF ( ln_read ) THEN
+
+         CALL check_nf90( nf90_open('dist_coast_uvtf.nc', NF90_NOWRITE, ncin), 'Error opening dist to coast file' )
+         CALL check_nf90( nf90_inq_varid( ncin, 'tdist', tdist_id ), 'Cannot get variable ID for tmask')
+         CALL check_nf90( nf90_get_var( ncin, tdist_id, zdct, (/ 1,1,klev /), (/ jpi, jpj,1 /) ) )
+         CALL check_nf90( nf90_close(ncin) ) 
+
+      ELSE
+
+         IF (klev == 1 ) THEN ! Since only a the surface distance to coast is used, only calculate once.
+            CALL cofdis( zdct )
+         ENDIF
+
+      ENDIF
+
       DO jj = 1, jpj
          DO ji = 1, jpi

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

@@ -94 +94 @@
            IF (ln_coast) THEN
               ! Reduce damping in vicinity of coastlines
-              CALL coast_dist_weight(resto)
+              CALL coast_dist_weight(resto, ln_readdistcoast, jk)
            ENDIF
         ENDIF

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

@@ -46 +46 @@
   LOGICAL :: ln_zero_top_layer = .false.
   LOGICAL :: ln_custom = .false.
+  LOGICAL :: ln_readdistcoast = .false.
 
   NAMELIST/nam_dmp_create/cp_cfg, cp_cfz, jp_cfg, lzoom, ln_full_field, &
                           ln_med_red_seas, ln_old_31_lev_code, ln_coast, &
                           ln_zero_top_layer, ln_custom, &
-                          pn_surf, pn_bot, pn_dep, nn_hdmp, jperio
+                          pn_surf, pn_bot, pn_dep, nn_hdmp, jperio, ln_readdistcoast
 
   CONTAINS 
@@ -72 +73 @@
      CALL check_nf90( nf90_inq_varid( ncin, 'vmask', vmask_id ), 'Cannot get variable ID for vmask')
      CALL check_nf90( nf90_inq_varid( ncin, 'fmask', fmask_id ), 'Cannot get variable ID for fmask')
-     CALL check_nf90( nf90_inq_varid( ncin, 'gdept_0', gdept_id ), 'Cannot get variable ID for gdept_0')
+     CALL check_nf90( nf90_inq_varid( ncin, 'gdept', gdept_id ), 'Cannot get variable ID for gdept_0')
      CALL check_nf90( nf90_inq_varid( ncin, 'gphit', gphit_id ), 'Cannot get variable ID for gphit')
      CALL check_nf90( nf90_inq_varid( ncin, 'gphiu', gphiu_id ), 'Cannot get variable ID for gphiu')