Skip to content
Success

Changes

Summary

  1. Remove upsilon 0 and 1 if branches (#1365) (details)
  2. Restart clubb 2d arr slicing fix (#1366) (details)
Commit a4826465aeec11af80e51e711d1cc0b8287e96c0 by noreply
Remove upsilon 0 and 1 if branches (#1365)

* Removed unnecessary upsilon_precip_frac_rat == 0 or 1 checks

The read in parameter upsilon_precip_frac_rat is set in .in files.
upsilon_precip_frac_rat describes the precipitation ratio between the first and second
PDF component.
The edge cases, all perticipitation in one PDF (upsilon=0 or 1) had their
own if branches. These edge case branches are not strictly necessary as upsilon
should never be set to 0 or 1 and we can live with a tiny precipitation fraction of
precip_frac_tol in such a case.
Furthermore a logic error was present which would never execute the if branch for the upsilon=0 case anyway.
Per default upsilon is not set to 0 and afaik is not tested in the jenkins tests.
However if upsilon is read in as 0 or 1 this commit would be technically BIT_CHANGING.

A mirrored code removal in clubb-jax was also done.

* changed comment about role of upsilon a bit
The file was modifiedsrc/CLUBB_core/precipitation_fraction.F90 (diff)
The file was modifiedclubb_jax/src/CLUBB_core/precipitation_fraction.py (diff)
Commit 89be3d5fd401ed3393a0a251b98752e552010ab9 by noreply
Restart clubb 2d arr slicing fix (#1366)

* Fixed 2d arr passing into restart_clubb subroutine which expects a 1d arr

This only affects behaviour upon clubb restarts. Because restarts are more of a debug feature and disabled in all current "..._model.in"
files I don't see the necessity to mark with bit changing.

* Added multicol support to restart tests script

Forwarding any extra cli options to the run_scm.py script which run_restart.py calls. E.g. -multicol

* Changed the bomex jenkins restart test to run with multicol. Changed the jenkins test name
The file was addedjenkins_tests/clubb_restart_multicol_gfortran_test/Jenkinsfile
The file was modifiedtests/run_restart_test.py (diff)
The file was removedjenkins_tests/clubb_restart_gfortran_test/Jenkinsfile
The file was modifiedsrc/clubb_driver.F90 (diff)