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

Add freshwater tracers #108

Open
wants to merge 56 commits into
base: master
Choose a base branch
from

Conversation

cbegeman
Copy link
Collaborator

This PR adds a freshwater tracer group that tracks the concentration of all surface mass fluxes to the ocean. The nonlocal flux term is not included because it would require a new nonLocalSurfaceTracerFlux struct array to separate the salinity flux into its constituent mass source terms. That term is also not included for other passive tracers.

@cbegeman
Copy link
Collaborator Author

@jonbob When you have time, would you be willing to take a look at this PR and let me know if you see any obvious issues why E3SM builds would fail while MPAS-O builds are successful? I imagine I might have missed something that your namelist-related scripts would pick up.

Here's the build log if that's helpful. I didn't see anything that looked informative to me. /lcrc/group/e3sm/ac.cbegeman/scratch/chrys/SMS_Lm1_P2048.ne30pg2_ECwISC30to60E2r1.CRYO1850-DISMF.chrysalis_intel.G.20240702_105706_xqyt5o/bld/e3sm.bldlog.240702-110049

Thank you so much!

@cbegeman
Copy link
Collaborator Author

@irenavankova Here's the branch in case you'd like to start taking a look at it.

@cbegeman cbegeman added the enhancement New feature or request label Jul 11, 2024
@darincomeau
Copy link
Collaborator

darincomeau commented Jul 12, 2024

@cbegeman I see this in the bld log:

/lcrc/group/e3sm/ac.cbegeman/scratch/chrys/SMS_Lm1_P2048.ne30pg2_ECwISC30to60E2r1.CRYO1850-DISMF.chrysalis_intel.G.20240702_105706_xqyt5o/bld/cmake-bld/core_ocean/shared/mpas_ocn_subgrid.f90(550): 
error #6404: This name does not have a type, and must have an explicit type.   [CONFIG_USE_SUBGRID_WETTING_DRYING]

I don't see that config option anywhere in this PR, are you perhaps running this on top of a different branch?

@jonbob
Copy link
Collaborator

jonbob commented Jul 12, 2024

good catch, @darincomeau. Let me see if running the scripts to make bld files helps

@jonbob
Copy link
Collaborator

jonbob commented Jul 12, 2024

@cbegeman -- the problem is that we haven't brought the wetting_drying namelist into E3SM yet, so the

config_use_subgrid_wetting_drying

namelist setting isn't currently available. We can bring it in, but it might take some discussion

@cbegeman
Copy link
Collaborator Author

Thanks, @darincomeau and @jonbob! This PR doesn't depend on wetting and drying at all. How can I get around this? Is there a particular commit/tag I should rebase this onto?

@xylar
Copy link
Collaborator

xylar commented Jul 12, 2024

@cbegeman, it looks like that's the base case you're trying to compare this branch to (based on the .G. in the name). So this is with master, right?

Could it be that the test case you're trying to run isn't a good choice? SMS_Lm1_P2048.ne30pg2_ECwISC30to60E2r1.CRYO1850-DISMF.chrysalis_intel? I think we want to be testing with E3SM v3 grids. Even if so, we probably want to know why this test case is broken and fix it.

@xylar
Copy link
Collaborator

xylar commented Jul 12, 2024

I've been using:

SMS_D_P480_Ld1.ne30pg2_r05_IcoswISC30E3r5.CRYO1850-DISMF.chrysalis_intel

@xylar
Copy link
Collaborator

xylar commented Jul 12, 2024

For what it's worth, I was able to build e3sm.exe for SMS_Lm1_P2048.ne30pg2_ECwISC30to60E2r1.CRYO1850-DISMF.chrysalis_intel with the current master:

/lcrc/group/e3sm/ac.xylar/scratch/chrys/SMS_Lm1_P2048.ne30pg2_ECwISC30to60E2r1.CRYO1850-DISMF.chrysalis_intel.G.20240712_102150_3q1ix1/bld

@cbegeman, it might be worth giving it another try.

@cbegeman
Copy link
Collaborator Author

@jonbob I'm not seeing the new tracer group config options appear in the namelist for e3sm cases. When you have a chance, can you give this branch a look and see if I've missed anything in the e3sm build namelists/scripts?

@jonbob
Copy link
Collaborator

jonbob commented Jul 17, 2024

@cbegeman -- I'll look now. Oh, you have to add the new group to the groups list in build-namelist

@irenavankova
Copy link

Past line 1819 in build-namelist add a new line tracer_forcing_freshwatertracers

@cbegeman
Copy link
Collaborator Author

Thanks for pointing this fix out @irenavankova! 81f93b2

@cbegeman cbegeman marked this pull request as ready for review July 29, 2024 21:44
@cbegeman cbegeman requested a review from xylar July 29, 2024 21:44
use existing lnd_domain attribute in infodata
we do not differentiate on coupler side if data land or not
still need to send the proper land domain file
domain file is actually set, in shr_strdata_type%domainFile
all the other data models use the first stream file for domain
information

land is the one that actually has that member set in the SDLND
structure

it is easier to get it from there, then from stream
the domain file in regular land case is defined by fatmlndfrac file
iMOAB_ApplyScalarProjectionWeights is not used
anymore
all maps are done now with seq_map method, and there is only
one instance of iMOAB_ApplyScalarProjectionWeights in E3SM
using moab driver
oksanaguba and others added 13 commits September 17, 2024 01:02
This adds compsets and new output variables to facilitate the E3SM and E3SM-MMF
contributions to phase 1 & 2 of the radiative-convective equilibrium model inter-comparison project (RCEMIP).

NOTE: in the original RCE compsets there was a slight error in the value of constant_zenith_deg being off by 1/100. This difference is inconsequential, but I wanted to fix it here to ensure consistency with the other RCEMIP models.

[non-BFB] - only for RCE cases because of updated constant_zenith_deg value
…ject#6621)

harden eamxx/prod testmod

makes the ERS eamxx/prod test compare outputs in all files, requiring pulling a bugfix from the scream repo.

[BFB]
Signed-off-by: Jason Boutte <boutte.jason@gmail.com>
Changes needed for spot/aurora: sycl kokkos spaces,
temporary TP changes (TP init will be sorted out later),
switch booleans to ints in F<-->xx interfaces.

see E3SM-Project#6569 for the original branch/history.

[bfb]
Add data land capability for moab driver;
case tested: --res r05_r05 --compset RMOSGPCC
standard data moab model, mainly adapt from data ocean implementation

major change: Initialize all factors set by MOAB area correction init routine to 1.0. It affects all models,
but it seems that some values were not initialized for data land case.
On chrysalis, with intel compiler, it actually complained about non initialized values when applying correction factors.

The compressing file errors seen during development were caused by non-ascii characters in the log files.
Those were caused by an uninitialized mapper, for which we were still creating a MOAB map. It was never used,
it is fixed properly now, the moab map is not computed anymore.

[BFB]
MALI update to fix issues from earlier PR causing sporadic test failures

Including a variable that was deactivated in the globalStats stream
caused sporadic failures during the second run of some ERS tests on
several platform/compiler combinations. That variable is now only
included when MALI is using Albany. Also updates a namelist default
that had been missed but does not change answers.

Fixes E3SM-Project#6600

[NML] for configurations with MALI
[BFB]
…3SM-Project#6633)

* Adds dane/ruby queue definitions
* Updates dane/ruby cmake macros
* Updates dane/ruby machine definition to use slurm and new modules
* Removes lc_slurm
@irenavankova
Copy link

The branch I used for the gcase runs with subglacial runoff tracers is here:

E3SM-Project/E3SM@master...irenavankova:E3SM:sgr_tracers

Probably a bit messy, so let me know if you want me to pick out something specific

…Project#6614)

This new feature allows `interpinic` to interpolate an ELM initial conditions file
that require storage in `NC_FORMAT_64BIT_DATA` and other netCDF4 formats.

[BFB] [Bugfix]
@cbegeman
Copy link
Collaborator Author

@cbegeman, the subglacial runoff is in master now. Do you want me to add the subglacial tracers to this pull request before moving it on?

@irenavankova I'll rebase this branch then compare the code against your branch. I'll let you know if I have any questions or issues. Thanks!

@cbegeman
Copy link
Collaborator Author

@irenavankova Can you rerun one of your isomip_plus configurations with subglacial fluxes with this new branch to test that capability? As far as I can tell, there's not an easy way to turn sgr on in this test case. I have rerun an isomip_plus case and it seems to be working as expected for ismf.

@irenavankova
Copy link

I ll rerun it, I have a compass branch modified for that. It might not be till tomorrow though.

@cbegeman
Copy link
Collaborator Author

@irenavankova No rush! Thanks!

@irenavankova
Copy link

@cbegeman, the isomip case with subglacial tracers runs fine on your branch.

Here is subglacial freshwater tracer in the top layer (first month average):

Screenshot 2024-10-07 at 18 00 59

And here the associated landice freshwater tracer:

Screenshot 2024-10-07 at 18 01 11

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

Successfully merging this pull request may close these issues.