Changeset 15526 for NEMO/branches

Timestamp:

2021-11-19T11:19:35+01:00 (3 years ago)

Author:

cdllod

Message:

adjustments of namelist_ref and code to read only one netcdf file

Location:

NEMO/branches/2021/dev_r15388_updated_zdfiwm

Files:

• cfgs/SHARED/namelist_ref (modified) (1 diff)
• src/OCE/ZDF/zdfiwm.F90 (modified) (5 diffs)

NEMO/branches/2021/dev_r15388_updated_zdfiwm/cfgs/SHARED/namelist_ref

@@ -1315 +1315 @@
    !           !  file name              ! frequency (hours) ! variable  ! time interp.!  clim  ! 'yearly'/ ! weights filename ! rotation ! land/sea mask !
    !           !                         !  (if <0  months)  !   name    !   (logical) !  (T/F) ! 'monthly' !                  ! pairing  !    filename   !
-   sn_mpb      = 'NOT USED'              , -12.              , 'mixing_power_bot' , .false.  , .true. , 'yearly' , '' , ''  , ''
-   sn_mpc      = 'NOT USED'              , -12.              , 'mixing_power_cri' , .false.  , .true. , 'yearly' , '' , ''  , ''
-   sn_mpn      = 'NOT USED'              , -12.              , 'mixing_power_nsq' , .false.  , .true. , 'yearly' , '' , ''  , ''
-   sn_mps      = 'NOT USED'              , -12.              , 'mixing_power_sho' , .false.  , .true. , 'yearly' , '' , ''  , ''
-   sn_dsb      = 'NOT USED'              , -12.              , 'decay_scale_bot'  , .false.  , .true. , 'yearly' , '' , ''  , ''
-   sn_dsc      = 'NOT USED'              , -12.              , 'decay_scale_cri'  , .false.  , .true. , 'yearly' , '' , ''  , ''
+   sn_mpb      = 'NOT USED'              , -12.              , 'power_bot' , .false.  , .true. , 'yearly' , '' , ''  , ''
+   sn_mpc      = 'NOT USED'              , -12.              , 'power_cri' , .false.  , .true. , 'yearly' , '' , ''  , ''
+   sn_mpn      = 'NOT USED'              , -12.              , 'power_nsq' , .false.  , .true. , 'yearly' , '' , ''  , ''
+   sn_mps      = 'NOT USED'              , -12.              , 'power_sho' , .false.  , .true. , 'yearly' , '' , ''  , ''
+   sn_dsb      = 'NOT USED'              , -12.              , 'scale_bot' , .false.  , .true. , 'yearly' , '' , ''  , ''
+   sn_dsc      = 'NOT USED'              , -12.              , 'scale_cri' , .false.  , .true. , 'yearly' , '' , ''  , ''
 /
 !!======================================================================

NEMO/branches/2021/dev_r15388_updated_zdfiwm/src/OCE/ZDF/zdfiwm.F90

@@ -123 +123 @@
       !!                     avs  = avs  +    av_wave * diffusivity_ratio(Reb)
       !!
-      !! ** Action  : - avt, avs, avm, increased by tide internal wave-driven mixing    
+      !! ** Action  : - avt, avs, avm, increased by internal wave-driven mixing    
       !!
       !! References :  de Lavergne et al. JAMES 2020, https://doi.org/10.1029/2020MS002065
@@ -246 +246 @@
       !
       IF( ln_tsdiff ) THEN                !* Option for differential mixing of salinity and temperature
-         DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 )       ! Calculate S/T diffusivity ratio as a function of Reb (else it is set to 1)
+         DO_3D( nn_hls-1, nn_hls-1, nn_hls-1, nn_hls-1, 2, jpkm1 ) ! Calculate S/T diffusivity ratio as a function of Reb (else it is set to 1)
             zav_ratio(ji,jj,jk) = ( 0.505_wp + &
                &                    0.495_wp * TANH( 0.92_wp * ( LOG10( MAX( 1.e-20, zReb(ji,jj,jk) * 5._wp * z1_6 ) ) - 0.60_wp ) ) &
@@ -307 +307 @@
       !!                  ***  ROUTINE zdf_iwm_init  ***
       !!                     
-      !! ** Purpose :   Initialization of the wave-driven vertical mixing, reading
-      !!              of input power maps and decay length scales in netcdf files.
+      !! ** Purpose :   Initialization of the internal wave-driven vertical mixing, reading
+      !!              of input power maps and decay length scales in a netcdf file.
       !!
       !! ** Method  : - Read the namzdf_iwm namelist and check the parameters
       !!
-      !!              - Read the input data in NetCDF files :
-      !!              bottom-intensified dissipation above abyssal hills (mixing_power_bot.nc)
-      !!              bottom-intensified dissipation at topographic slopes (mixing_power_cri.nc)
-      !!              dissipation scaling with squared buoyancy frequency (mixing_power_nsq.nc)
-      !!              dissipation due to shoaling internal tides (mixing_power_sho.nc)
-      !!              decay scale for abyssal hill dissipation (decay_scale_bot.nc)
-      !!              decay scale for topographic-slope dissipation (decay_scale_cri.nc)
+      !!              - Read the input data in a NetCDF file (zdfiwm_forcing.nc) with variables:
+      !!              'power_bot' bottom-intensified dissipation above abyssal hills
+      !!              'power_cri' bottom-intensified dissipation at topographic slopes
+      !!              'power_nsq' dissipation scaling with squared buoyancy frequency
+      !!              'power_sho' dissipation due to shoaling internal tides
+      !!              'scale_bot' decay scale for abyssal hill dissipation
+      !!              'scale_cri' decay scale for topographic-slope dissipation
       !!
       !! ** input   : - Namlist namzdf_iwm
-      !!              - NetCDF files : mixing_power_bot.nc, mixing_power_cri.nc, mixing_power_nsq.nc,
-      !!              mixing_power_sho.nc, decay_scale_bot.nc, decay_scale_cri.nc
+      !!              - NetCDF file : zdfiwm_forcing.nc
       !!
       !! ** Action  : - Increase by 1 the nstop flag is setting problem encounter
@@ -334 +333 @@
       !
       CHARACTER(len=256)            ::   cn_dir                 ! Root directory for location of ssr files
-      INTEGER, PARAMETER            ::   jpiwm  = 6             ! maximum number of files to read
+      INTEGER, PARAMETER            ::   jpiwm  = 6             ! maximum number of variables to read
       INTEGER, PARAMETER            ::   jp_mpb = 1
       INTEGER, PARAMETER            ::   jp_mpc = 2
@@ -391 +390 @@
       DO ifpr= 1, jpiwm
          ALLOCATE( sf_iwm(ifpr)%fnow(jpi,jpj,1)   )
-         IF( slf_iwm(ifpr)%ln_tint )ALLOCATE( sf_iwm(ifpr)%fdta(jpi,jpj,1,2) )
+         IF( slf_iwm(ifpr)%ln_tint ) ALLOCATE( sf_iwm(ifpr)%fdta(jpi,jpj,1,2) )
       END DO