From 2cb7922a6d511bc1cbc77f45fd31c58a448bca01 Mon Sep 17 00:00:00 2001 From: Joe Hamman Date: Sat, 24 Oct 2015 23:01:17 -0700 Subject: [PATCH] add rasm and pnw sample configurations using git lfs --- .gitattributes | 2 + .gitignore | 1 + config/rvic_convert_example.cfg | 95 ------------- .../configs/rvic.convolution.rasm.cfg | 27 ++-- samples/configs/rvic.parameters.pnw.cfg | 133 ++++++++++++++++++ .../configs/rvic.parameters.rasm.cfg | 24 ++-- samples/domains/domain.lnd.bpa304.20140311.nc | 3 + .../domains/domain.lnd.wr50a_ar9v4.100920.nc | 3 + .../Wu_routing_inputs_060313.nc | 3 + .../pnw.RVIC.input_20140218.nc | 3 + samples/forcings/rasm_sample_runoff.nc | 3 + .../columbia_sample_pour_points.csv | 3 + .../pour_points/rasm_sample_pour_points.csv | 3 + samples/uh_box/UH_Columbia_hourly.csv | 3 + samples/uh_box/UH_RASM_hourly.csv | 3 + 15 files changed, 188 insertions(+), 121 deletions(-) create mode 100644 .gitattributes delete mode 100644 config/rvic_convert_example.cfg rename config/rvic_convolution_example.cfg => samples/configs/rvic.convolution.rasm.cfg (90%) create mode 100644 samples/configs/rvic.parameters.pnw.cfg rename config/rvic_parameters_example.cfg => samples/configs/rvic.parameters.rasm.cfg (89%) create mode 100644 samples/domains/domain.lnd.bpa304.20140311.nc create mode 100644 samples/domains/domain.lnd.wr50a_ar9v4.100920.nc create mode 100644 samples/flow_directions/Wu_routing_inputs_060313.nc create mode 100644 samples/flow_directions/pnw.RVIC.input_20140218.nc create mode 100644 samples/forcings/rasm_sample_runoff.nc create mode 100644 samples/pour_points/columbia_sample_pour_points.csv create mode 100644 samples/pour_points/rasm_sample_pour_points.csv create mode 100644 samples/uh_box/UH_Columbia_hourly.csv create mode 100644 samples/uh_box/UH_RASM_hourly.csv diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a0e751d --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +*.nc filter=lfs diff=lfs merge=lfs -text +*.csv filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore index 3652051..484bd40 100644 --- a/.gitignore +++ b/.gitignore @@ -21,6 +21,7 @@ rvic.egg-info # Configuration Files # ####################### *cfg +samples/cases/* # Packages # ############ diff --git a/config/rvic_convert_example.cfg b/config/rvic_convert_example.cfg deleted file mode 100644 index ffeddd8..0000000 --- a/config/rvic_convert_example.cfg +++ /dev/null @@ -1,95 +0,0 @@ -#-- ========================================================================== --# -#-- --# -#-- This RVIC namelist contains options and paths for the --# -#-- development of the RVIC parameter file based on existing --# -#-- UHS files from either the C or Fortran Version of the model. --# -#-- --# -#-- ========================================================================== --# - -# Note: namelist is parsed by the python ConfigParser module. %(Interploation) is -# supported inside [sections] only. - -[OPTIONS] -#-- ====================================== --# -#--Level to log output at (char) --# -# valid values: DEBUG, INFO, WARNING, ERROR, CRITICAL -LOG_LEVEL:INFO - -#--Print output to console in addition to the log file (bool) --# -# valid values: True, False -VERBOSE:True - -#--case description (char) --# -CASEID:example_case_name - -#--routing domain grid shortname (char) --# -GRIDID: example_grid_id - -#--case run directory (char) --# -CASE_DIR:/path/to/%(CASEID)s/ - -#-- Output parameter file format (char) --# -# Valid Values: NETCDF3_CLASSIC, NETCDF3_64BIT, NETCDF4_CLASSIC, and NETCDF4 -# For use with CESM, NETCDF3_CLASSIC is reccomended. -NETCDF_FORMAT:NETCDF3_CLASSIC - -#-- Output parameter file compression options --# -# Descriptions of these options can be found in -NETCDF_ZLIB: False -NETCDF_COMPLEVEL: 4 -NETCDF_SIGFIGS: None - -#-- Length of unit hydrograph subset in days (int) --# -SUBSET_DAYS:10 - -#-- Constrain the final unit hydrographs sum to be less than or equal to the domain fractions --# -# True when routing to coastal grid cells, else False -CONSTRAIN_FRACTIONS:False -#-- ====================================== --# - -[UHS_FILES] -#-- ====================================== --# -#-- Routing program UHS files were created in (char) --# -# Valid Values: C, Fortran -ROUT_PROGRAM:C - -#-- Location of UHS files (char) --# -ROUT_DIR: /path/to/inputUHS/ - -#-- Path to stations file (char) --# -STATION_FILE: %(ROUT_DIR)s/stations.route_c -#-- ====================================== --# - -[ROUTING] -#-- ====================================== --# -#-- Output Interval --# -# Timestep of unit hydrographs. -OUTPUT_INTERVAL: 86400 -#-- ====================================== --# - -[DOMAIN] -#-- ====================================== --# -#-- Path to cesm complient domain file, this needs to match the dimensions of -# the grid the UHS files were developed on (char) --# -FILE_NAME: /path/to/domain.lnd.nc - -#-- netCDF Variable Names --# -LONGITUDE_VAR: lon -LATITUDE_VAR: lat -LAND_MASK_VAR: mask -FRACTION_VAR: frac -AREA_VAR: area -#-- ====================================== --# - -[NEW_DOMAIN] -#-- ====================================== --# -#-- Path to cesm complient domain file final routing to be done on (char) --# -FILE_NAME: /path/to/domain.rvic.nc - -#-- netCDF Variable Names --# -LONGITUDE_VAR: lon -LATITUDE_VAR: lat -LAND_MASK_VAR: mask -FRACTION_VAR: frac -AREA_VAR: area -#-- ====================================== --# diff --git a/config/rvic_convolution_example.cfg b/samples/configs/rvic.convolution.rasm.cfg similarity index 90% rename from config/rvic_convolution_example.cfg rename to samples/configs/rvic.convolution.rasm.cfg index e3a3ca8..ac2d35e 100644 --- a/config/rvic_convolution_example.cfg +++ b/samples/configs/rvic.convolution.rasm.cfg @@ -19,13 +19,10 @@ VERBOSE:True #-- ====================================== --# #--case run directory (char) --# -CASE_DIR : /path/to/%(CASEID)s/ - -#--RVIC tag (char) --# -RVIC_TAG : 1.0beta +CASE_DIR : ./samples/cases/%(CASEID)s/ #--case description (char) --# -CASEID : testing +CASEID : sample_rasm_convolution #--case description (char) --# CASESTR : a simple test run @@ -39,7 +36,7 @@ CALENDAR : noleap RUN_TYPE : drystart #--Run start date (yyyy-mm-dd-hh). Only used for startup and drystart runs (char) --# -RUN_STARTDATE : 1989-01-01-01 +RUN_STARTDATE : 1979-09-01-00 #-- ====================================== --# @@ -106,7 +103,7 @@ RVICHIST_OUTTYPE: grid, array RVICHIST_NCFORM: NETCDF4_CLASSIC, NETCDF4_CLASSIC #-- Output parameter file compression options --# -# Descriptions of these options can be found in +# Descriptions of these options can be found in RVICHIST_NETCDF_ZLIB: False RVICHIST_NETCDF_COMPLEVEL: 4 RVICHIST_NETCDF_SIGFIGS: None @@ -119,7 +116,7 @@ RVICHIST_UNITS: m3/s, m3/s [DOMAIN] #--rof domain file (char) --> -FILE_NAME: /path/to/domain.lnd.nc +FILE_NAME: ./samples/domains/domain.lnd.wr50a_ar9v4.100920.nc LONGITUDE_VAR: xc LATITUDE_VAR: yc AREA_VAR: area @@ -136,24 +133,24 @@ FILE_NAME: None [PARAM_FILE] #--rvic parameter file file (char) --> -FILE_NAME:/path/to/rvic.prm.nc +FILE_NAME: ./samples/cases/sample_rasm_parameters/params/sample_rasm_parameters.rvic.prm.wr50a.20151024.nc #-- ====================================== --# [INPUT_FORCINGS] -DATL_PATH:/path/to/ +DATL_PATH: ./samples/forcings/ # prfix.$YYYY[-$MM-[$DD[-$HH]]].nc -DATL_FILE: inputs.lnd.h.$YYYY-$MM.nc +DATL_FILE: rasm_sample_runoff.nc #--variable names (char) --> TIME_VAR: time -LATITUDE_VAR: lat -DATL_LIQ_FLDS: l2x_Flrl_rofliq +LATITUDE_VAR: yc +DATL_LIQ_FLDS: Runoff, Baseflow #--start date, date formate YYYY[-MM[-DD]] (char) --> -START:1989-01 +START: #--end date, date formate YYYY[-MM[-DD]] (char) --> -END:1989-12 +END: #-- ====================================== --# diff --git a/samples/configs/rvic.parameters.pnw.cfg b/samples/configs/rvic.parameters.pnw.cfg new file mode 100644 index 0000000..a61483a --- /dev/null +++ b/samples/configs/rvic.parameters.pnw.cfg @@ -0,0 +1,133 @@ +#-- ========================================================================== --# +#-- --# +#-- This RVIC namelist contains options and paths for the --# +#-- development of the RVIC parameter file. --# +#-- --# +#-- --# +#-- ========================================================================== --# + +# Note: namelist is parsed by the python ConfigParser module. %(Interploation) is +# supported inside [sections] only. + +[OPTIONS] +#-- ====================================== --# +#--Level to log output at (char) --# +# valid values: DEBUG, INFO, WARNING, ERROR, CRITICAL +LOG_LEVEL:DEBUG + +#--Print output to console in addition to the log file (bool) --# +# valid values: True, False +VERBOSE:True + +#--Delete temporary files, only used if REMAP=True (bool) --# +# valid values: True, False +CLEAN: False + +#--case description (char) --# +CASEID: sample_pnw_parameters + +#--routing domain grid shortname (char) --# +GRIDID: pnw + +#--case run directory (char) --# +CASE_DIR: ./samples/cases/%(CASEID)s + +#--Directory to use for temporary read/write operations (char) --# +TEMP_DIR:%(CASE_DIR)s/temp/ + +#--Remap Unit Hydrographs from [ROUTING] grid to [DOMAIN] grid (bool) --# +# valid values: True, False +REMAP:False + +#--Aggregate all [POUR_POINTS] inside each [DOMAIN] grid cell (bool) --# +# This should only be used when routing to coastal grid cells for CESM +AGGREGATE:False + +#--Size of pad to add to aggregated files prior to remapping (int) --# +AGG_PAD:25 + +#-- Output parameter file format (char) --# +# Valid Values: NETCDF3_CLASSIC, NETCDF3_64BIT, NETCDF4_CLASSIC, and NETCDF4 +# For use with CESM, NETCDF3_CLASSIC is recommended. +NETCDF_FORMAT:NETCDF3_CLASSIC + +#-- Output parameter file compression options --# +# Descriptions of these options can be found in +NETCDF_ZLIB: False +NETCDF_COMPLEVEL: 4 +NETCDF_SIGFIGS: None + +#-- Length of unit hydrograph subset in days (int) --# +SUBSET_DAYS:10 + +#-- Constrain the final unit hydrographs sum to be less than or equal to the domain fractions --# +# True when routing to coastal grid cells, else False +CONSTRAIN_FRACTIONS: False + +SEARCH_FOR_CHANNEL: True + +#-- ====================================== --# + +[POUR_POINTS] +#-- ====================================== --# +#-- Path to Pour Points File (char) --# +# A comma separated file of outlets to route to [lons, lats] - one coordinate pair per line (order not important) +# May optionally include a column [names] - which will (if not aggregating) be included in param file +FILE_NAME: ./samples/pour_points/columbia_sample_pour_points.csv + +#-- ====================================== --# + +[UH_BOX] +#-- ====================================== --# +#-- Path to UH Box File (char) --# +# This defines the unit hydrograph to rout flow to the edge of each grid cell. +# A comma separated file of [time in seconds, unit hydrograph ordinate] - one timestep per line +# The timestep should be 1hr (3600 sec) or less. +FILE_NAME: ./samples/uh_box/UH_Columbia_hourly.csv + +#-- Number of Header lines to ignore in [UH_BOX]FILE_NAME (INT) --# +HEADER_LINES = 1 +#-- ====================================== --# + +[ROUTING] +#-- ====================================== --# +#-- Path to routing inputs netcdf (char) --# +FILE_NAME: ./samples/flow_directions/pnw.RVIC.input_20140218.nc + +#-- netCDF Variable Names --# +LONGITUDE_VAR: lon +LATITUDE_VAR: lat +FLOW_DISTANCE_VAR: Flow_Distance +FLOW_DIRECTION_VAR: Flow_Direction +BASIN_ID_VAR: Basin_ID +SOURCE_AREA_VAR: Source_Area + +#-- Velocity and diffusion --# +# The velocity and diffusion parameters may either be specified as variables in +# the routing netcdf (char) or as a single value (float or int) +VELOCITY: 1 +DIFFUSION: 2000 + +#-- Output Interval --# +# Timestep of output unit hydrographs. Must be a multiple of the timestep in the UH_BOX +OUTPUT_INTERVAL:86400 + +#-- Maximum time for runoff to reach outlet (days) --# +BASIN_FLOWDAYS:50 + +#-- Maximum time for runoff to pass through a grid cell (days) --# +CELL_FLOWDAYS:2 +#-- ====================================== --# + +[DOMAIN] +#-- ====================================== --# +#-- Path to cesm complient domain file (char) --# +FILE_NAME: ./samples/domains/domain.lnd.bpa304.20140311.nc + +#-- netCDF Variable Names --# +LONGITUDE_VAR: lon +LATITUDE_VAR: lat +LAND_MASK_VAR: mask +FRACTION_VAR: frac +AREA_VAR: area +#-- ====================================== --# diff --git a/config/rvic_parameters_example.cfg b/samples/configs/rvic.parameters.rasm.cfg similarity index 89% rename from config/rvic_parameters_example.cfg rename to samples/configs/rvic.parameters.rasm.cfg index 01f514f..3877a19 100644 --- a/config/rvic_parameters_example.cfg +++ b/samples/configs/rvic.parameters.rasm.cfg @@ -24,13 +24,13 @@ VERBOSE:True CLEAN:False #--case description (char) --# -CASEID:example2 +CASEID: sample_rasm_parameters #--routing domain grid shortname (char) --# -GRIDID: some grid +GRIDID: wr50a #--case run directory (char) --# -CASE_DIR:/path/to/%(CASEID)s/ +CASE_DIR: ./samples/cases/%(CASEID)s #--Directory to use for temporary read/write operations (char) --# TEMP_DIR:%(CASE_DIR)s/temp/ @@ -48,11 +48,11 @@ AGG_PAD:25 #-- Output parameter file format (char) --# # Valid Values: NETCDF3_CLASSIC, NETCDF3_64BIT, NETCDF4_CLASSIC, and NETCDF4 -# For use with CESM, NETCDF3_CLASSIC is reccomended. +# For use with CESM, NETCDF3_CLASSIC is recommended. NETCDF_FORMAT:NETCDF3_CLASSIC #-- Output parameter file compression options --# -# Descriptions of these options can be found in +# Descriptions of these options can be found in NETCDF_ZLIB: False NETCDF_COMPLEVEL: 4 NETCDF_SIGFIGS: None @@ -62,7 +62,9 @@ SUBSET_DAYS:10 #-- Constrain the final unit hydrographs sum to be less than or equal to the domain fractions --# # True when routing to coastal grid cells, else False -CONSTRAIN_FRACTIONS:False +CONSTRAIN_FRACTIONS: True + +SEARCH_FOR_CHANNEL: False #-- ====================================== --# @@ -71,7 +73,7 @@ CONSTRAIN_FRACTIONS:False #-- Path to Pour Points File (char) --# # A comma separated file of outlets to route to [lons, lats] - one coordinate pair per line (order not important) # May optionally include a column [names] - which will (if not aggregating) be included in param file -FILE_NAME: /path/to/rout2points.csv +FILE_NAME: ./samples/pour_points/rasm_sample_pour_points.csv #-- ====================================== --# @@ -81,7 +83,7 @@ FILE_NAME: /path/to/rout2points.csv # This defines the unit hydrograph to rout flow to the edge of each grid cell. # A comma separated file of [time in seconds, unit hydrograph ordinate] - one timestep per line # The timestep should be 1hr (3600 sec) or less. -FILE_NAME: /path/to/UH_file.csv +FILE_NAME: ./samples/uh_box/UH_RASM_hourly.csv #-- Number of Header lines to ignore in [UH_BOX]FILE_NAME (INT) --# HEADER_LINES = 1 @@ -90,7 +92,7 @@ HEADER_LINES = 1 [ROUTING] #-- ====================================== --# #-- Path to routing inputs netcdf (char) --# -FILE_NAME: /path/to/routing_inputs.nc +FILE_NAME: ./samples/flow_directions/Wu_routing_inputs_060313.nc #-- netCDF Variable Names --# LONGITUDE_VAR: lon @@ -108,7 +110,7 @@ DIFFUSION: 2000 #-- Output Interval --# # Timestep of output unit hydrographs. Must be a multiple of the timestep in the UH_BOX -OUTPUT_INTERVAL:3600 +OUTPUT_INTERVAL:86400 #-- Maximum time for runoff to reach outlet (days) --# BASIN_FLOWDAYS:50 @@ -120,7 +122,7 @@ CELL_FLOWDAYS:2 [DOMAIN] #-- ====================================== --# #-- Path to cesm complient domain file (char) --# -FILE_NAME: /path/to/domain.lnd.nc +FILE_NAME: ./samples/domains/domain.lnd.wr50a_ar9v4.100920.nc #-- netCDF Variable Names --# LONGITUDE_VAR: xc diff --git a/samples/domains/domain.lnd.bpa304.20140311.nc b/samples/domains/domain.lnd.bpa304.20140311.nc new file mode 100644 index 0000000..0b656b2 --- /dev/null +++ b/samples/domains/domain.lnd.bpa304.20140311.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d80e82382b3b63e5ce85439b4f09ad6d37a8e0e9286055e45048e95420529a0e +size 1429444 diff --git a/samples/domains/domain.lnd.wr50a_ar9v4.100920.nc b/samples/domains/domain.lnd.wr50a_ar9v4.100920.nc new file mode 100644 index 0000000..650b14f --- /dev/null +++ b/samples/domains/domain.lnd.wr50a_ar9v4.100920.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8da151a4973ba9f5da754d6f9ac2f7ec0b3d3a00bfe48bcbe5903feb94c7203f +size 5639788 diff --git a/samples/flow_directions/Wu_routing_inputs_060313.nc b/samples/flow_directions/Wu_routing_inputs_060313.nc new file mode 100644 index 0000000..732480f --- /dev/null +++ b/samples/flow_directions/Wu_routing_inputs_060313.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f3aaa36c73babae9f658040b52b53ca7a1785c7a1fef562731f51259ec6d65c2 +size 9176972 diff --git a/samples/flow_directions/pnw.RVIC.input_20140218.nc b/samples/flow_directions/pnw.RVIC.input_20140218.nc new file mode 100644 index 0000000..0ae1a14 --- /dev/null +++ b/samples/flow_directions/pnw.RVIC.input_20140218.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d542a17c7699a003324df0ac59b878e0b9ff6b8f132d23dc035bf446e6155d61 +size 578248 diff --git a/samples/forcings/rasm_sample_runoff.nc b/samples/forcings/rasm_sample_runoff.nc new file mode 100644 index 0000000..20acbd3 --- /dev/null +++ b/samples/forcings/rasm_sample_runoff.nc @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:391d25ede08bdfb9dac4375ae37d7a3f4dc02fb62bc72078a9ce52a2ebf61c91 +size 28862969 diff --git a/samples/pour_points/columbia_sample_pour_points.csv b/samples/pour_points/columbia_sample_pour_points.csv new file mode 100644 index 0000000..c76fda6 --- /dev/null +++ b/samples/pour_points/columbia_sample_pour_points.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ce13e2314839c6c2a560db0381b32df6e09300f35a0f4591dc256e0690f9610e +size 518 diff --git a/samples/pour_points/rasm_sample_pour_points.csv b/samples/pour_points/rasm_sample_pour_points.csv new file mode 100644 index 0000000..2acaaab --- /dev/null +++ b/samples/pour_points/rasm_sample_pour_points.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:16458c8ced7dd66fb6116a81adb42ce2742cfc4b97b5d6f6788b90ce6668e735 +size 289 diff --git a/samples/uh_box/UH_Columbia_hourly.csv b/samples/uh_box/UH_Columbia_hourly.csv new file mode 100644 index 0000000..a63327a --- /dev/null +++ b/samples/uh_box/UH_Columbia_hourly.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d71cfae383a339a5f3168ef304fc571bf9f81b49417392be3f1881c3b030def +size 881 diff --git a/samples/uh_box/UH_RASM_hourly.csv b/samples/uh_box/UH_RASM_hourly.csv new file mode 100644 index 0000000..a63327a --- /dev/null +++ b/samples/uh_box/UH_RASM_hourly.csv @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5d71cfae383a339a5f3168ef304fc571bf9f81b49417392be3f1881c3b030def +size 881