Skip to content

Bring example experiements up to date #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
owang01 wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bring example experiements up to date #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b6c5344
Remove retired name list entry nml_avgPeriod
owang01 Mar 28, 2023
3cc821d
Add back missing parameter VEC_points in the example experiments (fou…
owang01 Mar 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions doc/diagnostic_vec_doc.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
7 changes: 5 additions & 2 deletions pkg/diagnostics_vec/diagnostics_vec_readparms.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down Expand Up @@ -265,4 +268,4 @@ SUBROUTINE DIAGNOSTICS_VEC_READPARMS( myThid )
END
CEOC
C----&------------------------------------------------------------------xxxxxxx|
C----&------------------------------------------------------------------xxxxxxx|
C----&------------------------------------------------------------------xxxxxxx|
3 changes: 2 additions & 1 deletion verification/global_ocean.cs32x15/code_dv/DIAGNOSTICS_VEC_SIZE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
INTEGER, PARAMETER :: nSURF_mask = 1
5 changes: 4 additions & 1 deletion verification/global_ocean.cs32x15/input_dv.seaice/data.diagnostics_vec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#
Expand Down
3 changes: 2 additions & 1 deletion verification/global_with_exf/code_dv/DIAGNOSTICS_VEC_SIZE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
INTEGER, PARAMETER :: nSURF_mask = 1
6 changes: 4 additions & 2 deletions verification/global_with_exf/input_dv/data.diagnostics_vec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#
Expand Down Expand Up @@ -36,7 +39,6 @@
&DIAG_VEC_INPUT_VARS

# averaging times
nml_avgPeriod = 1200.,
nml_startTime = 0,
nml_endTime = 1576800000.,

Expand Down
3 changes: 2 additions & 1 deletion verification/tutorial_global_oce_latlon/code_dv/DIAGNOSTICS_VEC_SIZE.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
INTEGER, PARAMETER :: nSURF_mask = 1
8 changes: 6 additions & 2 deletions verification/tutorial_global_oce_latlon/input_dv/data.diagnostics_vec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
#
Expand Down Expand Up @@ -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',
Expand Down