diff --git a/doc/diagnostic_vec_doc.rst b/doc/diagnostic_vec_doc.rst index 10698d5..a184979 100644 --- a/doc/diagnostic_vec_doc.rst +++ b/doc/diagnostic_vec_doc.rst @@ -115,12 +115,14 @@ Specifying parameters in data.diagnostics_vec +------------------------+------------------------------------------------------------------------------------------+ | Parameter | Description | +========================+==========================================================================================+ - | nml_avgPeriod | averaging period duration | - +------------------------+------------------------------------------------------------------------------------------+ | nml_startTime | start time of output | +------------------------+------------------------------------------------------------------------------------------+ | nml_endTime | end time of output | +------------------------+------------------------------------------------------------------------------------------+ + | nml_vec_avg_periods | averaging period duration of output for each vector mask | + +------------------------+------------------------------------------------------------------------------------------+ + | nml_sf_avg_periods | averaging period duration of output for each surface mask | + +------------------------+------------------------------------------------------------------------------------------+ | nml_boundaryFiles | filenames of lateral boundary masks | +------------------------+------------------------------------------------------------------------------------------+ | nml_surfaceFiles | filenames of surface boundary mask | diff --git a/pkg/diagnostics_vec/diagnostics_vec_readparms.F b/pkg/diagnostics_vec/diagnostics_vec_readparms.F index 621acb8..3ade209 100755 --- a/pkg/diagnostics_vec/diagnostics_vec_readparms.F +++ b/pkg/diagnostics_vec/diagnostics_vec_readparms.F @@ -48,9 +48,12 @@ SUBROUTINE DIAGNOSTICS_VEC_READPARMS( myThid ) C | - undefRL :: Undefined number to check if parameters were given | C | | C | Defined by user in data.diagnostics_vec: | -C | - nml_avgPeriod :: averaging period (frequency) of output | C | - nml_startTime :: start time for output | C | - nml_endTime :: end time for output | +C | - nml_vec_avg_periods :: averaging period (frequency) of output | +C | for each vector mask | +C | - nml_sf_avg_periods :: averaging period (frequency) of output | +C | for each surface mask | C | - nml_vecFiles :: filenames for the boundary masks | C | - nml_sfFiles :: filenames for the surface masks | C | - nml_fields2D :: 2D field names for ocean state and | @@ -265,4 +268,4 @@ SUBROUTINE DIAGNOSTICS_VEC_READPARMS( myThid ) END CEOC C----&------------------------------------------------------------------xxxxxxx| -C----&------------------------------------------------------------------xxxxxxx| \ No newline at end of file +C----&------------------------------------------------------------------xxxxxxx| diff --git a/verification/global_ocean.cs32x15/code_dv/DIAGNOSTICS_VEC_SIZE.h b/verification/global_ocean.cs32x15/code_dv/DIAGNOSTICS_VEC_SIZE.h index 910a6c2..926dcfb 100755 --- a/verification/global_ocean.cs32x15/code_dv/DIAGNOSTICS_VEC_SIZE.h +++ b/verification/global_ocean.cs32x15/code_dv/DIAGNOSTICS_VEC_SIZE.h @@ -2,5 +2,6 @@ C------------------------------------------------------------------------------| C DIAGNOSTICS_VEC_SIZE.h C------------------------------------------------------------------------------| + INTEGER, PARAMETER :: VEC_points = 1000 INTEGER, PARAMETER :: nVEC_mask = 1 - INTEGER, PARAMETER :: nSURF_mask = 1 \ No newline at end of file + INTEGER, PARAMETER :: nSURF_mask = 1 diff --git a/verification/global_ocean.cs32x15/input_dv.seaice/data.diagnostics_vec b/verification/global_ocean.cs32x15/input_dv.seaice/data.diagnostics_vec index 60f376a..8e93135 100755 --- a/verification/global_ocean.cs32x15/input_dv.seaice/data.diagnostics_vec +++ b/verification/global_ocean.cs32x15/input_dv.seaice/data.diagnostics_vec @@ -2,9 +2,12 @@ # Diagnostics_vec Package Choices #-------------------------------------------------------------------------------- # Averaging Period: -# nml_avgPeriod : averaging period duration (negative => snapshot) # nml_startTime : start time of output # nml_endTime : end time of output +# nml_vec_avg_periods :: averaging period (frequency) of output +# for each vector mask +# nml_sf_avg_periods :: averaging period (frequency) of output +# for each surface mask # nml_debugLevel : determine how much output is printed from each function # (increases in output from 0 to 3) # diff --git a/verification/global_with_exf/code_dv/DIAGNOSTICS_VEC_SIZE.h b/verification/global_with_exf/code_dv/DIAGNOSTICS_VEC_SIZE.h index b1f0e6d..460db7f 100755 --- a/verification/global_with_exf/code_dv/DIAGNOSTICS_VEC_SIZE.h +++ b/verification/global_with_exf/code_dv/DIAGNOSTICS_VEC_SIZE.h @@ -2,5 +2,6 @@ C------------------------------------------------------------------------------| C DIAGNOSTICS_VEC_SIZE.h C------------------------------------------------------------------------------| + INTEGER, PARAMETER :: VEC_points = 1000 INTEGER, PARAMETER :: nVEC_mask = 4 - INTEGER, PARAMETER :: nSURF_mask = 1 \ No newline at end of file + INTEGER, PARAMETER :: nSURF_mask = 1 diff --git a/verification/global_with_exf/input_dv/data.diagnostics_vec b/verification/global_with_exf/input_dv/data.diagnostics_vec index 60ff92b..b59c31f 100755 --- a/verification/global_with_exf/input_dv/data.diagnostics_vec +++ b/verification/global_with_exf/input_dv/data.diagnostics_vec @@ -2,9 +2,12 @@ # Diagnostics_vec Package Choices #-------------------------------------------------------------------------------- # Averaging Period: -# nml_avgPeriod : averaging period duration (negative => snapshot) # nml_startTime : start time of output # nml_endTime : end time of output +# nml_vec_avg_periods :: averaging period (frequency) of output +# for each vector mask +# nml_sf_avg_periods :: averaging period (frequency) of output +# for each surface mask # nml_debugLevel : determine how much output is printed from each function # (increases in output from 0 to 3) # @@ -36,7 +39,6 @@ &DIAG_VEC_INPUT_VARS # averaging times - nml_avgPeriod = 1200., nml_startTime = 0, nml_endTime = 1576800000., diff --git a/verification/tutorial_global_oce_latlon/code_dv/DIAGNOSTICS_VEC_SIZE.h b/verification/tutorial_global_oce_latlon/code_dv/DIAGNOSTICS_VEC_SIZE.h index 1501cab..1d8aa9a 100644 --- a/verification/tutorial_global_oce_latlon/code_dv/DIAGNOSTICS_VEC_SIZE.h +++ b/verification/tutorial_global_oce_latlon/code_dv/DIAGNOSTICS_VEC_SIZE.h @@ -2,5 +2,6 @@ C------------------------------------------------------------------------------| C DIAGNOSTICS_VEC_SIZE.h C------------------------------------------------------------------------------| + INTEGER, PARAMETER :: VEC_points = 1000 INTEGER, PARAMETER :: nVEC_mask = 2 - INTEGER, PARAMETER :: nSURF_mask = 1 \ No newline at end of file + INTEGER, PARAMETER :: nSURF_mask = 1 diff --git a/verification/tutorial_global_oce_latlon/input_dv/data.diagnostics_vec b/verification/tutorial_global_oce_latlon/input_dv/data.diagnostics_vec index b56f26c..e05a1d8 100755 --- a/verification/tutorial_global_oce_latlon/input_dv/data.diagnostics_vec +++ b/verification/tutorial_global_oce_latlon/input_dv/data.diagnostics_vec @@ -2,9 +2,12 @@ # Diagnostics_vec Package Choices #-------------------------------------------------------------------------------- # Averaging Period: -# nml_avgPeriod : averaging period duration (negative => snapshot) # nml_startTime : start time of output # nml_endTime : end time of output +# nml_vec_avg_periods :: averaging period (frequency) of output +# for each vector mask +# nml_sf_avg_periods :: averaging period (frequency) of output +# for each surface mask # nml_debugLevel : determine how much output is printed from each function # (increases in output from 0 to 3) # @@ -36,9 +39,10 @@ &DIAG_VEC_INPUT_VARS # averaging times - nml_avgPeriod = 1800., nml_startTime = 0, nml_endTime = 1576800000., + nml_vec_avg_periods(1:2) = 1800., 1800., + nml_sf_avg_periods(1) = 1800., # mask files names for the lateral variables nml_vecFiles(1) = 'equator_mask.bin',