-
Notifications
You must be signed in to change notification settings - Fork 133
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
Bug fixes for ISPOL and NICE test options. BFB physics #89
Conversation
1. Adds missing parameters to init and write_parameters and init_zbgc 2. Corrects seg fault when using iron tracers 3. Fix to interpolation of 6 hourly data 4. Typo in forcing flag for NICE and parameter name 5. Adds nutrient data option for NICE 6. Corrections test configuration for NICE and bgc 7. Flag change to allow iron chemistry without DOC 8. Fixes for SKL bgc: corrects growth max & adds flag warning
@eclare108213 : Hopefully the conflicts should be minor. I branched from master late last week. |
@njeffery The conflicts are coming from the refactoring of how constants are handled: #83 |
Here are the lines that are conflicting, in case the 'resolve conflicts' button isn't working for you. |
I believe the resolution should be to use the "master" version, but maybe add c4 to the list. Then, if there are any other new icepack constants that are needed, they should be set via a query to icepack_query_constants. Nicole, if you need me to look at this, let me know. |
I resolved the conflicts. Just needed to add c4 to what's already in master. Do you see them as resolved?
…________________________________
From: Elizabeth Hunke <notifications@github.com>
Sent: Monday, January 8, 2018 12:52:49 PM
To: CICE-Consortium/Icepack
Cc: Jeffery, Nicole; Mention
Subject: Re: [CICE-Consortium/Icepack] Bug fixes for ISPOL and NICE test options. BFB physics (#89)
Here are the lines that are conflicting, in case the 'resolve conflicts' button isn't working for you.
<<<<<<< njeffery_NICE
use icedrv_constants, only: nu_diag, nu_forcing, secday
use icedrv_constants, only: c0, c1, c2, c10, c100, p5, c4
use icedrv_constants, only: secday, Tffresh, qqqice, TTTice, rhos
use icedrv_constants, only: nu_diag, nu_forcing
use icedrv_constants, only: c0, c1, c2, c10, c100, p5
master
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#89 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AH1K6rozXnd8FG0o7ZcQ2M8iWt8Cgjpyks5tInIRgaJpZM4RWjU_>.
|
It still shows as being conflicted. Did you push your changes to njeffrey_NICE branch on your fork? |
After pulling, my branch still has atm_climatological which uses tffresh, qqqice, TTTice and rhos. Should I keep the line... |
You should remove that line and give it a try. If you need any of those constants and they are not already set, then you will need to define local variables and use icepack_query_constants to set them. Again, happy to help if there are questions. |
tffresh, qqqice, tttice and rhos are needed for option thermo1.
559a5ea resolves the conflicts. |
I still see conflicts, did you push the change to your branch? Looking at the files, icedrv_forcing still has this line, |
Yes. I pushed to my branch. The line is needed for the thermo1 option.
…________________________________
From: Tony Craig <notifications@github.com>
Sent: Monday, January 8, 2018 4:19:00 PM
To: CICE-Consortium/Icepack
Cc: Jeffery, Nicole; Mention
Subject: Re: [CICE-Consortium/Icepack] Bug fixes for ISPOL and NICE test options. BFB physics (#89)
I still see conflicts, did you push the change to your branch? Looking at the files, icedrv_forcing still has this line,
use icedrv_constants, only: secday, Tffresh, qqqice, TTTice, rhos
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub<#89 (comment)>, or mute the thread<https://github.com/notifications/unsubscribe-auth/AH1K6mNS0GYtDkmTW2rhscPErFUaIULIks5tIqJkgaJpZM4RWjU_>.
|
That line has been replaced by a query to the icepack constants. Please remove it and see if things still work. |
I tried this. The code compiles and runs and gets the same answers as in a baseline case from Nicole's branch. However there are still a couple of bugs, so I'll let @njeffery fix them before merging. Nicole, here's what to do, to get to where I was: create baseline: [eclare@pi-fe1 github]$ git clone -b njeffery_NICE https://github.com/njeffery/Icepack Icepack.NICE2
and adding c4 to the previous line |
I will fix the conflict and execute this PR so that I can clean up the Icepack code, which undoubtedly would create more conflicts. The two failing tests noted above will still need to be fixed. |
@njeffery @chrisknewman |
Are the code changes bit for bit, different at roundoff level, or more substantial?
Is the documentation being updated with this PR? (Y/N)
If not, does the documentation need to be updated separately? (Y/N)
"Documentation" includes information on the wiki and .rst files in doc/source/,
which are used to create the online technical docs at https://cice-consortium.github.io/Icepack/
Please suggest code reviewers in the column at right.
Other Relevant Details: