Merge master into develop after latest update#651
Merged
tdcwilliams merged 20 commits intodevelopfrom Apr 30, 2024
Merged
Conversation
New master 20230905
results much worse This reverts commit cfa1207.
…s that forcings should be linked to
…ds) to thermo.ocean_nudge_time[T,S]_days
Latest version of forecast code running the topaz5 NRT product (going into master since it is not tuned with the bugfix for shortwave radiation which is in develop)
- new datasets `topaz5_nrt_[nodes,elements]`
- new tuning parameter `thermo.freezingpoint_mu` (was `mu` from `constants.hpp`) for varying the freezing point rule
- also fix bug (missing `break`) where `unesco` was always being chosen over `linear` (with `mu=0.057` they are nearly the same)
- remove `value_no_thick_ice()` and related variables from `ModelVariable` class, which was only used by T_ice. This variable is now handled separately and set to the freezing point when there is no old ice as before.
- rename forcing/ice-init options and enum and dataset names, remove `erai` forcing. `setup.atmosphere-type` options:
```
("constant", setup::AtmosphereType::CONSTANT)
("generic_ps", setup::AtmosphereType::GENERIC_PS)
("asr", setup::AtmosphereType::ASR)
("era5", setup::AtmosphereType::ERA5)
("ecmwf_nrt", setup::AtmosphereType::ECMWF_NRT)
("cfsr", setup::AtmosphereType::CFSR)
("cfsr_hi", setup::AtmosphereType::CFSR_HI)
("ecmwf_nrt_arome", setup::AtmosphereType::ECMWF_NRT_AROME)
("ecmwf_nrt_arome_ensemble", setup::AtmosphereType::ECMWF_NRT_AROME_ENSEMBLE);
```
`setup.ocean-type` options:
```
("constant", setup::OceanType::CONSTANT)
("topaz4_rean", setup::OceanType::TOPAZ4R)
("topaz4_rean_atrest", setup::OceanType::TOPAZ4R_ATREST)
("topaz4_nrt", setup::OceanType::TOPAZ4NRT)
("topaz5_nrt", setup::OceanType::TOPAZ5NRT)
("topaz4_rean-altimeter", setup::OceanType::TOPAZ4R_ALTIMETER)
("coupled", setup::OceanType::COUPLED)
("glorys12", setup::OceanType::GLORYS12R);
```
`setup-icetype` options:
```
("constant", setup::IceType::CONSTANT)
("constant_partial", setup::IceType::CONSTANT_PARTIAL)
("topaz4_rean", setup::IceType::TOPAZ4R)
("topaz4_nrt", setup::IceType::TOPAZ4NRT)
("topaz5_nrt", setup::IceType::TOPAZ5NRT)
("topaz4_nrt-amsr2", setup::IceType::TOPAZ4NRT_AMSR2)
("topaz4_nrt-amsr2-osisaf", setup::IceType::TOPAZ4NRT_AMSR2_OSISAF)
("topaz4_nrt-amsr2-osisaf-nic", setup::IceType::TOPAZ4NRT_AMSR2_OSISAF_NIC)
("topaz4_nrt-amsr2-osisaf-nic_weekly", setup::IceType::TOPAZ4NRT_AMSR2_OSISAF_NICWEEKLY)
("amsre", setup::IceType::AMSRE)
("amsr2", setup::IceType::AMSR2)
("amsr2_cst_thick", setup::IceType::AMSR2CSTTHICK)
("amsr2-cst_thick", setup::IceType::AMSR2_CSTTHICK)
("piomas", setup::IceType::PIOMAS)
("nemo", setup::IceType::NEMO)
("cice", setup::IceType::CICE)
("cs2-smos", setup::IceType::CS2_SMOS)
("cs2-smos-amsr2", setup::IceType::CS2_SMOS_AMSR2)
("smos", setup::IceType::SMOS)
("topaz4_rean-osisaf-icesat", setup::IceType::TOPAZ4R_OSISAF_ICESAT)
("glorys12", setup::IceType::GLORYS12R);
```
Make the use of underscore/hyphen in these options more systematic. Note `cs2_smos` -> `cs2-smos`
- ocean nudge time changed to days and names changed to `thermo.ocean_nudge_time[T,S]_days`
- Check water depth is positive in basal stress calculation
`depth_eff = std::max(0., element_ssh + std::max(min_water_depth, M_element_depth[cpt]))`
tdcwilliams
approved these changes
Apr 30, 2024
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This merges master into develop after @tdcwilliams updated master with the latest forecast code.