Changeset 4739 for branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/TOOLS/DMP_TOOLS/src/utils.F90

Timestamp:

2014-08-13T10:46:04+02:00 (10 years ago)

Author:

timgraham

Message:

Updated C1D/dyndmp.F90 and trcdmp.F90 to read restoration coefficient from a file.
Modified namelist_top_ref to match new options
Bug fixes to DMP_TOOLS tool and addition of custom.F90 to allow users to make modifications. Also changed to use working precision (wp) throughout.

File:

• branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/TOOLS/DMP_TOOLS/src/utils.F90 (modified) (4 diffs)

branches/2014/dev_r4650_UKMO3_masked_damping/NEMOGCM/TOOLS/DMP_TOOLS/src/utils.F90

@@ -6 +6 @@
   PUBLIC
   
+  INTEGER, PUBLIC, PARAMETER   :: dp=8 , sp=4, wp=dp
   INTEGER :: tmask_id, umask_id, vmask_id, fmask_id
   INTEGER :: gdept_id
@@ -13 +14 @@
   INTEGER :: jpi, jpj, jpk                      ! Size of domain
   INTEGER  :: ncin, ncout                              ! File handles for netCDF files
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: gphit, glamt
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: gphiu, glamu
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: gphiv, glamv
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: gphif, glamf
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: tmask, umask, vmask, fmask
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: gdept
-  REAL(8), DIMENSION(:,:),   ALLOCATABLE :: resto
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: gphit, glamt
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: gphiu, glamu
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: gphiv, glamv
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: gphif, glamf
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: tmask, umask, vmask, fmask
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: gdept
+  REAL(wp), DIMENSION(:,:),   ALLOCATABLE :: resto
 
   INTEGER,PARAMETER :: numout = 6
   INTEGER,PARAMETER :: numerr = 0
   INTEGER,PARAMETER :: numnam = 11
-  REAL(8),PARAMETER :: rday = 86400           ! seconds in a day
-  REAL(8),PARAMETER ::   rpi = 3.141592653589793
-  REAL(8),PARAMETER ::   rad = 3.141592653589793/180.
-  REAL(8),PARAMETER ::   ra =  6371229.
+  REAL(wp),PARAMETER :: rday = 86400           ! seconds in a day
+  REAL(wp),PARAMETER ::   rpi = 3.141592653589793
+  REAL(wp),PARAMETER ::   rad = 3.141592653589793/180.
+  REAL(wp),PARAMETER ::   ra =  6371229.
 
   ! Namelist variables
@@ -42 +43 @@
   LOGICAL :: ln_full_field = .true.
   LOGICAL :: ln_med_red_seas = .false.
+  LOGICAL :: ln_old_31_lev_code = .false.
   LOGICAL :: ln_zero_top_layer = .false.
   LOGICAL :: ln_custom = .false.
 
   NAMELIST/nam_dmp_create/cp_cfg, cp_cfz, jp_cfg, lzoom, ln_full_field, &
-                          ln_med_red_seas, ln_coast, ln_zero_top_layer, ln_custom, &
+                          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
 
@@ -106 +109 @@
      CALL check_nf90( nf90_def_dim(ncout, 'z', jpk, id_z) )
 
-     CALL check_nf90( nf90_def_var(ncout, 'resto', nf90_float, (/id_x,id_y,id_z/), resto_id ) )
+     CALL check_nf90( nf90_def_var(ncout, 'resto', nf90_double, (/id_x,id_y,id_z/), resto_id ) )
      CALL check_nf90( nf90_enddef(ncout) )