Skip to content
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

feat: drop uses_forcing_file field #144

Merged
merged 3 commits into from
Aug 2, 2024
Merged

feat: drop uses_forcing_file field #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5f6fb2a
feat: drop uses_forcing_file. closes #127
aaraney Jul 31, 2024
e6fc303
chore: drop 'uses_forcing_file' field from examples
aaraney Jul 31, 2024
51aac75
bump ngen.config 0.2.6 -> 0.3.0
aaraney Jul 31, 2024
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
4 changes: 1 addition & 3 deletions python/ngen_cal/tests/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
"init_config": "/Users/nels.frazier/workspace/ngen//data/bmi/c/cfe/cat-27_bmi_config.ini",
"allow_exceed_end_time": False,
"fixed_time_step": False,
"uses_forcing_file": False,
"variables_names_map": {
"atmosphere_water__liquid_equivalent_precipitation_rate": "precip_rate",
"water_potential_evaporation_flux": "potential_evapotranspiration",
Expand Down Expand Up @@ -66,7 +65,6 @@
"init_config": "/Users/nels.frazier/workspace/ngen//data/bmi/c/cfe/cat-27_bmi_config.ini",
"allow_exceed_end_time": False,
"fixed_time_step": False,
"uses_forcing_file": False,
"variables_names_map": {
"atmosphere_water__liquid_equivalent_precipitation_rate": "precip_rate",
"water_potential_evaporation_flux": "potential_evapotranspiration",
Expand Down Expand Up @@ -148,4 +146,4 @@
"evaluation_stop": "2015-12-30 23:00:00"}
}

model_params = {"binary":"echo", "args":"ngen args", **evaluation_options}
model_params = {"binary":"echo", "args":"ngen args", **evaluation_options}
2 changes: 1 addition & 1 deletion python/ngen_conf/src/ngen/config/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.2.6'
__version__ = "0.3.0"
1 change: 0 additions & 1 deletion python/ngen_conf/src/ngen/config/bmi_formulation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ class BMIParams(BaseModel, smart_union=True, allow_population_by_field_name = Tr
allow_exceed_end_time: bool = False
# see #NOAA-OWP/ngen-cal #47 for explanation
fixed_time_step: bool = True
uses_forcing_file: bool = False
name_map: Mapping[str, str] = Field(None, alias='variables_names_map')

#strictly optional fields (null/none) by default
Expand Down
4 changes: 0 additions & 4 deletions python/ngen_conf/tests/data/test_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"init_config": "",
"allow_exceed_end_time": false,
"fixed_time_step": false,
"uses_forcing_file": false,
"modules": [
{
"name": "bmi_fortran",
Expand All @@ -22,7 +21,6 @@
"init_config": "NOAH/cat-1.input",
"allow_exceed_end_time": true,
"fixed_time_step": false,
"uses_forcing_file": false,
"variables_names_map": {
"PRCPNONC": "atmosphere_water__liquid_equivalent_precipitation_rate",
"Q2": "atmosphere_air_water~vapor__relative_saturation",
Expand All @@ -45,7 +43,6 @@
"init_config": "cfe/config.txt",
"allow_exceed_end_time": true,
"fixed_time_step": false,
"uses_forcing_file": false,
"variables_names_map": {
"atmosphere_water__liquid_equivalent_precipitation_rate": "QINSUR",
"water_potential_evaporation_flux": "EVAPOTRANS",
Expand All @@ -67,7 +64,6 @@
"init_config": "/dev/null",
"allow_exceed_end_time": true,
"fixed_time_step": false,
"uses_forcing_file": false,
"model_params": {
"sloth_ice_fraction_schaake(1,double,m,node)": 0.0,
"sloth_ice_fraction_xinan(1,double,1,node)": 0.0,
Expand Down
4 changes: 0 additions & 4 deletions python/ngen_config_gen/examples/ngen_realization/example_bmi_multi_realization_config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
"init_config": "/dev/null",
"allow_exceed_end_time": true,
"main_output_variable": "z",
"uses_forcing_file": false,
"model_params": {
"sloth_ice_fraction_schaake(1,double,m,node)": 0.0,
"sloth_ice_fraction_xinan(1,double,1,node)": 0.0,
Expand Down Expand Up @@ -48,7 +47,6 @@
"SOLDN": "land_surface_radiation~incoming~shortwave__energy_flux",
"SFCPRS": "land_surface_air__pressure"
},
"uses_forcing_file": false
}
},
{
Expand All @@ -75,11 +73,9 @@
"ice_fraction_xinan": "sloth_ice_fraction_xinan",
"soil_moisture_profile": "sloth_smp"
},
"uses_forcing_file": false
}
}
],
"uses_forcing_file": false
}
}
],
Expand Down
Loading