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

fix stop_option=date, move neon niwo test to match user_mods #1411

Merged
merged 27 commits into from
Jul 26, 2021

Conversation

jedwards4b
Copy link
Contributor

@jedwards4b jedwards4b commented Jun 25, 2021

Description of changes

Move the NEON_NIWO test to NEON/NIWO to match the names in usermods

Specific notes

Contributors other than yourself, if any:

CTSM Issues Fixed (include github issue #):
Fixes #1412

Are answers expected to change (and if so in what way)? No

Any User Interface Changes (namelist or namelist defaults changes)?

Testing performed, if any:
Hand testing of SMS_D_Vnuopc_Mmpi-serial.CLM_USRDAT.I1PtClm51Bgc.cheyenne_intel.clm-NEON-NIWO
Also ran cmeps testlist and cdeps testlist.

@jedwards4b
Copy link
Contributor Author

Fixes #1412

@ekluzek ekluzek self-assigned this Jun 29, 2021
@ekluzek ekluzek added enhancement new capability or improved behavior of existing capability PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete labels Jun 29, 2021
@wwieder
Copy link
Contributor

wwieder commented Jun 29, 2021

address this NEON_NCAR issue NEONScience/NCAR-NEON#39

Copy link
Collaborator

@ekluzek ekluzek left a comment

Choose a reason for hiding this comment

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

I have a couple small changes requested. Let me know if you want to chat about the NEON test mods. I think the hierarchy should look like:

default
NEON -- include default
NEON/NIWO -- include NEON + user_mod/NEON/NIWO

Using the default test-mods will have output more frequently for short tests, turn on the B4BFLAG as you did, as well as fire-emissions.

@wwieder wwieder mentioned this pull request Jun 29, 2021
7 tasks
@jedwards4b
Copy link
Contributor Author

Needed to add externals and change .config_files.xml for the new cime directory structure.

@ekluzek
Copy link
Collaborator

ekluzek commented Jul 8, 2021

@wwieder do you still want something that addresses NEONScience/NCAR-NEON#39 here? I think this does include downloading data to $RUNDIR, so partially addresses that. And I think that's sufficient for now. There might be a longer term issue that comes in later that's more comprehensive. But, is the current solution of downloading to $RUNDIR sufficient for now?

@wwieder
Copy link
Contributor

wwieder commented Jul 8, 2021

@ekluzek I'm happy with how this is being handled now.

@wwieder
Copy link
Contributor

wwieder commented Jul 8, 2021

The one thing I'll add its that it's potentially for users to know about this file, which lists all the sites and data available.
https://neon-ncar.s3.data.neonscience.org/listing.csv
Maybe this just goes into our documentation for how to run NEON sites.
Maybe it's time to start making a wiki or notebook for this! @negin513 and @danicalombardozzi what do you think?

@jedwards4b
Copy link
Contributor Author

jedwards4b commented Jul 8, 2021 via email

@wwieder
Copy link
Contributor

wwieder commented Jul 8, 2021

oh, I didn't realize that. very good. thanks, @jedwards4b

@jedwards4b
Copy link
Contributor Author

@ekluzek I have updated the test in testlist_clm.xml to the new testname format and tested the change.
I am currently creating tags for the externals and will update Externals.cfg when that is done.

@jedwards4b
Copy link
Contributor Author

@negin513 just waiting for new surface datasets.

@negin513
Copy link
Contributor

For testing:
The original dataset (subset from the global) for both 78 pfts and 16 pfts are in: /glade/scratch/negins/single_point
The updated dataset using NEON data is in: /glade/scratch/negins/single_point_neon_updated
There is a bug in my code for updating the surface dataset using neon and that is why the updated surface dataset list is not complete. 
I will get back to you on the complete list later today.

@wwieder
Copy link
Contributor

wwieder commented Jul 15, 2021 via email

@jedwards4b
Copy link
Contributor Author

@negin513 We use a wildcard in the name of the file: surfdata_hist_78pfts_CMIP6_simyr2000_${NEONSITE}_c210715.nc

it would sure be easier if you could create all of the files with the same date stamp. (some are 14 others are 15)

@ekluzek
Copy link
Collaborator

ekluzek commented Jul 15, 2021

@billsacks this does use the new test syntax so it does need beyond cime6.0.0. Since, @jedwards4b has done some testing I think we should try it out and see if we run into any other problems with it. If we can get a cime6.0.3 tag that might be the best. I'll ask about that.

@billsacks
Copy link
Member

I think we should try it out and see if we run into any other problems with it. If we can get a cime6.0.3 tag that might be the best. I'll ask about that.

I'm fine with that plan if you are. I can make a cime tag since Chris is out.

@jedwards4b
Copy link
Contributor Author

jedwards4b commented Jul 15, 2021 via email

@billsacks
Copy link
Member

By the way: it looks like cime6.0.2 isn't sufficient if you want to use the new test syntax in this PR, since it came in post-cime6.0.2 - so the upcoming cime6.0.3 will be required for this.

@ekluzek
Copy link
Collaborator

ekluzek commented Jul 17, 2021

@negin513 note the files under $DIN_LOC_ROOT/lnd/clm2/surfdata_map/NEON/surfdata_hist_78pfts_CMIP6_simyr2000_*_c210715.nc are in NetCDF4 format and we need CESM inputdata files to be in any other NetCDF format. So can you change the script to put them in a different format? Go ahead and do that when you get a chance. Thanks.

@jedwards4b
Copy link
Contributor Author

jedwards4b commented Jul 18, 2021 via email

@ekluzek
Copy link
Collaborator

ekluzek commented Jul 19, 2021

@jedwards4b yes rimport caught if for me. I could do the nccopy easy enough, but I figure we want to modify the creation script anyway, and want to get it corrected. And we want the corrected script in this next tag anyway as well. So I'm working with @negin513 on making that happen.

@negin513
Copy link
Contributor

@ekluzek
As we discussed, I update the script to write out the output in NETCDF3_64BIT instead of netcdf4.

All the data is ending with *_c210720.nc :

The original dataset (subset from the global) for 78 pfts in NETCDF3_64BIT : /glade/scratch/negins/single_point/

The updated dataset using NEON data in NETCDF3_64BIT: /glade/scratch/negins/single_point_neon_updated

The updated script for creating the data : #1375

Please let me know if there is anything else needed from my side.

@ekluzek
Copy link
Collaborator

ekluzek commented Jul 22, 2021

OK, tests pass as expected on izumi. I have a few more tests on cheyenne that are running. The unit tests are failing, because the directory structure was changed. But, I should be able to fix that and get it working pretty easily.

@ekluzek ekluzek merged commit 5640348 into ESCOMP:master Jul 26, 2021
@ekluzek ekluzek deleted the neon_test_rename branch July 26, 2021 07:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement new capability or improved behavior of existing capability PR status: ready PR: this is ready to merge in, with all tests satisfactory and reviews complete
Projects
No open projects
Development

Successfully merging this pull request may close these issues.

Reduce data requirements for NEON single point sites
5 participants