More MARBL updates for CESM3#339
Conversation
Also add flags to support initializing MARBL tracers from file using native vertical grid (e.g. restart file). Note that currently the MARBL tracers are split across multiple restarts, so users will need to combine them into a single file before using this feature.
MOM6 now reads a single file containing two iron sediment fluxes and a vent flux, rather than one file per field.
Was not nesting conditionals correctly
I updated names of variables relating to the iron sediment and vent fluxes, which changes some defaults in MOM_input (and the input data file checker)
Hybrid cases default to MARBL_TRACERS_IC_FILE_IS_Z=False, and MARBL_IC_MIN_VAL is only used when initializing from Z
Also moved all aux_mom_MARBL tests to TL319_t233, made sure MARBL_IC_MIN_VAL is only set in tests that use MARBL, and created a new iron forcing file for tx2_3v2 with the old data presented in the new format (single file, different field names)
I had modified MOM_input.yaml but not input_data_list.yaml
|
I'm running These are expected; the NLCOMP failures come from the new I did also see I'm not sure what happened with the |
|
The PET test passes now: |
|
I can confirm that only the expected tests are failing: @alperaltuntas this is ready for review. Summary of changes (this is the intent of the changes, if anything goes against this list it's likely a mistake that I'm happy to fix):
|
Need to set some grid-specific BGC parameters for the
tx2_3v3grid, and also NCAR/MOM6#434 changes how MOM6 expects to some BGC forcing data to be provided (so this PR updatesMOM_input). There might be some other parameter changes coming from @kristenkrumhardt, she is tuning MARBL and I don't know if the MOM6 parameters should be set ParamGen or if we'll just update the default values in the Fortran code. I'll take this out of draft mode when all of that has been finalized.