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

Setting the release candidate as the new master #187

Merged
merged 538 commits into from
Apr 26, 2023
Merged

Conversation

chartick
Copy link
Contributor

@chartick chartick commented Apr 18, 2023

This pull request will make the release_candidate the new master in order to create a new release of TSMP. Due to the inclusion of an updated PDAF, it consists of a few hundred commits. The relevant changes for the main part of TSMP are included in the last commits.

The following shows the changelog which will be attached to the release after the pull request is accepted. You can also find it in our hedgedoc.

TSMP changelog draft

Release notes v1.4.0

General

  • The ParFlow directory is now version-free. This is visible in bldsva/intf_oas3/parflow. ParFlow >=3.11 is now required.

  • Update cordex test case (CLM grid & ParFlow Slopes)

  • Update idealscal test case (COSMO v5_1 enabled and files uploaded to datapub)

  • The behavior of COSMO after restarts is improved.

  • Improved and restructured documentation

  • An option is added to the build script to set the maximum pfts per grid cell in CLM3_5 maxfpt.

  • The coupling timestep for ICON is now given in seconds.

  • Include the commit hash of TSMP and components in TSMP log-file

New additions to TSMP

  • Enabling Stage 2023 with Intel as the new default

  • MSA support

  • Include eCLM model (sta, oas)

  • Support for ICON-NWP

  • New ICON testcase idiurnal-cycle

  • Porting of TSMP to the DEEP cluster

  • Inclusion of updated PDAF in the master

  • Update instrument application with Score-P

Clean-ups

  • Removal of mandatory internal version number -v. Instead, the combination -c is extended with model versions (clm3-cos-pfl).

  • Clean-up of setups folder. Duplications are removed and unsupported setups are moved to Deprecated

  • Build and setup are separated (in terms of calling functions).

  • Removal of duplicity in machines/ and inft_oas3/

  • Removed automatic pulling of ParFlow while building

  • Clean-up of decommissioned machines

  • Removal of OASIS (without MCT) support

Replacing the variable in `model/Makefile` and `framework/Makefile` is
identical for all machines and can therefore be moved to the
common_build_interface. The new function `c_configure_pdaf` is
introduced for this purpose.
non-communicator related updates
amps_CommWorld communicator may allow for a better implementation,
less changes needed by PDAF-integration
keep PseudoAdvanceRichards up-to-date with AdvanceRichards of v3.12.0
These were already removed in `master`
Prevent repetitive computation of `t_start/da_interval`.
they are basically duplicate code
@chartick chartick requested a review from DCaviedesV April 18, 2023 11:18
@DCaviedesV
Copy link
Contributor

@s-poll @jjokella @niklaswr please have a look at the changelog draft and comment accordingly

@niklaswr
Copy link
Member

I would highlight ParFlow >=3.11 is now required under general as major change.

The rest reads well - some major improvements 👍

@s-poll
Copy link
Member

s-poll commented Apr 20, 2023

In general the release notes reads fine.

A few minor remarks to be added in the Notes:
- Update cordex test case (CLM grid & ParFlow Slopes)
- Update idealscal test case (COSMO v5_1 enabled and data-pub)

jjokella added 10 commits April 20, 2023 14:35
Before, PDAF combination strings were only parsed, when containing an
explicit COSMO version. This lead (to my understanding) to the problem
that no PDAF-build without COSMO could be started. Now COSMO5 is the
default, when PDAF is called, and it can be called without COSMO,
f.e. with
```
-c clm-pfl-pdaf
```
@jjokella
Copy link
Contributor

jjokella commented Apr 21, 2023

Hi all I have just checked the PDAF-side of this release and it is now good to go from my side.

I would like to direct you, and especially @chartick to a commit that I have introduced in the main build script in order to be able to build sub-combinations of component models in connection with PDAF: b10873f

Everything else is purely PDAF/manual related and should be fine!

@chartick
Copy link
Contributor Author

Thanks, @jjokella. I have transferred the changes of b10873f to the setup script. It is not used for PDAF yet, but it is better to be consistent. I think we are ready now.

Copy link
Contributor

@DCaviedesV DCaviedesV left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok. We are good to go then.
@chartick go ahead with merging, and tag the new release. Please include the changelog (updated with the comments in the PR discussion) as release notes.

@chartick chartick merged commit dad9a4c into master Apr 26, 2023
@chartick chartick deleted the release_candidate branch May 12, 2023 08:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants