Skip to content

Commit

Permalink
Merge pull request #752 from rarutter/structure_details
Browse files Browse the repository at this point in the history
- Removes second topo_file entry in config.js
- Sets SP output off by default
- Removes whitespace in output_spec.csv
- Adds xarray and pypdf import for Docker container
- Adds Git SHA to restart and run_status files
- Moves 'utilities to look at/interact with dvmdostem
data' to ./scripts/viewers/
- Removes scripts/notebooks that have doc replacements
- Removes outdated scripts/examples
  • Loading branch information
rarutter authored Nov 8, 2024
2 parents 0a09191 + 0e17b14 commit 68ad4a2
Show file tree
Hide file tree
Showing 21 changed files with 9 additions and 14,827 deletions.
3 changes: 1 addition & 2 deletions config/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,11 @@
"fri_fire_file": "demo-data/cru-ts40_ar5_rcp85_ncar-ccsm4_toolik_field_station_10x10/fri-fire.nc",
"hist_exp_fire_file": "demo-data/cru-ts40_ar5_rcp85_ncar-ccsm4_toolik_field_station_10x10/historic-explicit-fire.nc",
"proj_exp_fire_file": "demo-data/cru-ts40_ar5_rcp85_ncar-ccsm4_toolik_field_station_10x10/projected-explicit-fire.nc",
"topo_file": "demo-data/cru-ts40_ar5_rcp85_ncar-ccsm4_toolik_field_station_10x10/topo.nc",
"output_dir": "output/",
"output_spec_file": "config/output_spec.csv",
"output_monthly": 1, //JSON specific
"output_nc_eq": 0,
"output_nc_sp": 1,
"output_nc_sp": 0,
"output_nc_tr": 1,
"output_nc_sc": 1,
"output_interval": 1
Expand Down
2 changes: 1 addition & 1 deletion config/output_spec.csv
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AVLN,Total soil available N,g/m2,,,invalid,invalid,invalid,,double,
BURNAIR2SOILN,Nitrogen deposit from fire emission,g/m2/time,,,invalid,invalid,invalid,invalid,double,
BURNSOIL2AIRC,Burned soil C,g/m2/time,,,invalid,invalid,invalid,invalid,double,
BURNSOIL2AIRN,Burned soil N,g/m2/time,,,invalid,invalid,invalid,invalid,double,
BURNTHICK,Ground burn thickness ,m,,,invalid,invalid,invalid,invalid,double,
BURNTHICK,Ground burn thickness,m,,,invalid,invalid,invalid,invalid,double,
BURNVEG2AIRC,Burned vegetation C to atmosphere,g/m2/time,,,invalid,invalid,invalid,invalid,double,
BURNVEG2AIRN,Burned vegetation N to atmosphere,g/m2/time,,,invalid,invalid,invalid,invalid,double,
BURNVEG2DEADC,Burned vegetation C to standing dead C,g/m2/time,,,invalid,invalid,invalid,invalid,double,
Expand Down
2 changes: 2 additions & 0 deletions requirements_general_dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ Sphinx==5.1.1
sphinx-rtd-theme==1.1.0
sphinx-toolbox==3.4.0
sphinx-argparse==0.4.0
xarray==2023.1.*
pypdf==5.1.*

# for SA - maybe merits its own file??
scikit-learn
Loading

0 comments on commit 68ad4a2

Please sign in to comment.