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.

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

work done last week to share data #36

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

Conversation

jordansread
Copy link
Member

No description provided.

Jordan S Read added 16 commits May 8, 2018 15:17
Merge branch 'master' of github.com:USGS-R/pgml_temperature_prediction

# Conflicts:
#	.gitignore
Merge branch 'master' of github.com:USGS-R/pgml_temperature_prediction

# Conflicts:
#	.gitignore
#	1_data_download/data_download.ind
#	1_data_s3/data_s3.ind
Merge branch 'master' of github.com:USGS-R/pgml_temperature_prediction

# Conflicts:
#	1_data_s3.yml
#	1_public_data_download/public_data_download.ind
Merge branch 'master' of github.com:USGS-R/pgml_temperature_prediction

# Conflicts:
#	1_data_s3_assimilate.yml
#	1_data_s3_assimilate/out/MN_fisheries_all_temp_data_Jan2018.rds.ind
#	1_data_s3_assimilate/out/MPCA_temp_data_all.rds.ind
#	1_data_s3_assimilate/out/URL_Temp_Logger_2006_to_2017.rds.ind
#	1_data_wqp/data_wqp.ind
#	2_get_model_files/get_model_files.ind
#	3_regroup_data.yml
#	3_regroup_data/out/data_summary_plots.pdf
#	3_regroup_data/out/data_summary_table.csv
#	3_regroup_data/out/nhd_120052195.rds.ind
#	3_regroup_data/out/nhd_120052233.rds.ind
#	3_regroup_data/out/nhd_120052238.rds.ind
#	3_regroup_data/out/nhd_120052889.rds.ind
#	3_regroup_data/out/nhd_120052896.rds.ind
#	3_regroup_data/out/nhd_13293262.rds.ind
#	3_regroup_data/out/nhd_2360642.rds.ind
#	3_regroup_data/out/nhd_4817675.rds.ind
#	3_regroup_data/out/nhd_7142570.rds.ind
@@ -32,7 +32,7 @@
&output
out_dir = '.'
out_fn = 'output'
nsave = 24
nsave = 1
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure why this changed. Not sure why we are checking in both the nml files and the .ind files for the nmls

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant