Add subglacial discharge at grounding line #6508
Conversation
|
@xylar -- thanks, I think that makes sense |
irenavankova
force-pushed
the
ocn/add-subglacial-runoff
branch
from
48cee50
to
77feb92
Compare
| @@ -274,6 +274,7 @@ | |||
| "ERS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.mpaso-jra_1958", | |||
| "PEM_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF.mpaso-jra_1958", | |||
| "SMS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF-TMIX.mpaso-jra_1958", | |||
| "SMS_P480_Ld5.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF-DSGR.mpaso-jra_1958", | |||
There was a problem hiding this comment.
Perfect! This is nearly identical to the test I ran:
SMS_P480_Lm1.TL319_IcoswISC30E3r5.GMPAS-JRA1p5-DIB-PISMF-DSGR.chrysalis_intel
It just brings in one year of JRA forcing and runs for only 5 days, not a month. So I'm sure it will work great!
|
@irenavankova, I think you accidentally took out @jonbob's commit that fixed the order of the namelist options, etc. I'll try to find that commit so you can cherry-pick it back on. |
|
@jonbob, I made the changes Xylar asked for, so I think this is now yours? Unless there are other things you think I should change. |
|
|
|
Oh, sorry, I see @jonbob's commit. My mistake. |
|
I accidentally took two commits out but then added them back in right away. So should be good now. |
|
I added a missing check for subglacial package that only came up to be missing when I was doing tests with this code base merged wtih Carolyn's tracers branch and tracers were active. |
|
Is this ready? |
|
By me yes, but I don't know if @jonbob has anything to add. |
|
@irenavankova is away but I think she would like to keep this moving along so I went ahead and reverted the changes to |
…6508) This introduces subglacial discharge (at the moment a fixed file interpolated from MALI output) at the grounding line as a freshwater volume flux at local freezing point. It follows closely what river runoff does. [NML] [BFB]
|
Passes:
with expected NML DIFFs. Also successfully runs the new test:
merged to next |
|
merged to master and all expected NML DFFs have been blessed except on mappy, which did not report today |
|
Thanks @jonbob! I know this has been quite a bit of work. I'm sure @irenavankova will be very happy to have this in when she gets back. |
Adds some variables were introduced in PR #6508 and not icluded in the appropriate omp private statement. These variables are only used for data subglacial runoff, so this does not impact current tests. Also changes the current GMPAS-JRA1p5-DIB-PISMF-DSGR test to PET to watch for threading issues. [BFB]
Add missing omp private variables for data subglacial runoff Adds some variables were introduced in PR #6508 and not icluded in the appropriate omp private statement. These variables are only used for data subglacial runoff, so this does not impact current tests. Also changes the current GMPAS-JRA1p5-DIB-PISMF-DSGR test to PET to watch for threading issues. [BFB]
…o next (PR #6672) Fix variables in data subglacial runoff This fixes a typo in PR #6508, where config_flux_attenuation_coefficient_runoff was mistakenly used in kpp loop instead of config_flux_attenuation_coefficient_subglacial_runoff These variables are only used for data subglacial runoff. [BFB] for all tested configurations
…6672) Fix variables in data subglacial runoff This fixes a typo in PR #6508, where config_flux_attenuation_coefficient_runoff was mistakenly used in kpp loop instead of config_flux_attenuation_coefficient_subglacial_runoff These variables are only used for data subglacial runoff. [BFB] for all tested configurations
This merge updates the E3SM-Project submodule from [727ad81](https://github.com/E3SM-Project/E3SM/tree/727ad81) to [1442143](https://github.com/E3SM-Project/E3SM/tree/1442143). This update includes the following MPAS-Ocean and MPAS-Frameworks PRs (check mark indicates bit-for-bit with previous PR in the list): - [ ] (ocn) E3SM-Project/E3SM#6509 - [ ] (ocn) E3SM-Project/E3SM#6508 - [ ] (fwk) E3SM-Project/E3SM#6575 - [ ] (ocn) E3SM-Project/E3SM#6590 - [ ] (fwk) E3SM-Project/E3SM#6643 - [ ] (ocn) E3SM-Project/E3SM#6656 - [ ] (ocn) E3SM-Project/E3SM#6672 - [ ] (ocn) E3SM-Project/E3SM#6659 - [ ] (ocn) E3SM-Project/E3SM#6497 - [ ] (ocn) E3SM-Project/E3SM#6485 - [ ] (ocn) E3SM-Project/E3SM#6566
This introduces subglacial discharge (at the moment a fixed file interpolated from MALI output) at the grounding line as a freshwater volume flux at local freezing point. It follows closely what river runoff does.
Related Ocean Discussion is here:
E3SM-Ocean-Discussion#82
[NML]
[BFB]