-
Notifications
You must be signed in to change notification settings - Fork 6
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
added potential evaporation to offline output, changed checks range, … #346
added potential evaporation to offline output, changed checks range, … #346
Conversation
…corrected epot var in cable_canopy. Fixes #335
@ccarouge Holding off on benchcab testing for now given that MAIN is currently broken. @AlisonBennett This changeset works for single site runs - and I see no reason why it shouldn't work in other situations. We should be able |
@har917 can I cherry pick this one across to BLAZE_9184 now? I will test it by default when doing the BLAZE 1000pt runs. |
yes - should be ready |
@har917 I tried the cherry pick but I think that BLAZE_9184 may be too far behind MAIN. A git cherry pick doesn't work because of the change in folder structure, and I have been unsuccessful with the manual cherry pick because the subroutine |
I did wonder whether this was going to be a problem since I didn't really recognise some of the code in the output section (and it can only go so far automatically) Perhaps the way forward is to manually port the intent of the code across into BLAZE_9184 |
Probably the simplest way forward if we want Pot_Evap in the output :) |
…ffline output. fixes #346
0a69346 reverts the evaluation of Instead a revised evaluation of |
…on-directly-from-the-offline-code-base
*benchcab regression testing This (of course) fails because of the new output variable Somewhat more worryingly - all time varying outputs have also been impacted - see Given the equivalent changes applied to the BLAZE_9184 branch produce bitwise equivalence on the other variables I think this has to be something to do with how the new output routine operate. Sending to review for another opinion as to whether this merits further investigation. |
@har917 Looking into it to see where the differences might be coming from so we can exclude the changes here. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I've looked into the numerical precision differences. It turns out this is linked to the fact we load openmpi in benchcab even when we do serial compilations. We'll need to look into that more in details in benchcab, but it means it's not a problem for this PR to go ahead.
I am approving but I have a question about where the update to epot
calculation is placed.
! INH #335 - we don't need to weight components of %epot by %transd | ||
! however coupled model uses %wetfac_cs so overwrite here before testing in ACCESS | ||
canopy%epot = (canopy%fevw_pot + ssnow%potev/ssnow%cls) * dels/air%rlam |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not sure I understand your comment here. Are you saying: wetfac_cs
is only used in ACCESS model and depends on the epot
value. So you don't want to update the epot
value in the DO loop before testing in ACCESS model.
Shouldn't it be irrelevant because either we need to weigh epot
with %transd
or we don't. Shouldn't this be a physics consideration and not a "let's see how the model responds" type of decision?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ideally we would change %epot
and hence %wetfac_cs
in the section above this change - and use the correct value in both offline and coupled. However since %wetfac_cs
is one of the coupling variables - and one that I think does get used - I think this needs independent testing within ACCESS (and so is a separate issue).
In the interim I opted to adjust %epot
after the evaluation of %wetfac_cs
which will allow updates to CABLE3 to be ported across to ACCESS as a first step towards resyncing the code bases.
Restoring this branch to reproduce CABLE-LSM/benchcab#304. |
CABLE
Thank you for submitting a pull request to the CABLE Project.
Description
This PR adds the potential evaporation diagnostic (
canopy%epot
) to fluxes section of the cable output.A minor correction to the diagnostic has also been applied - which could lead to impacts in the coupled model (via
%wetfac_cs
and JULES variableresft
) - and the checks_ranges updated.Fixes #335
Type of change
Please delete options that are not relevant.
Checklist
Please add a reviewer when ready for review.
📚 Documentation preview 📚: https://cable--346.org.readthedocs.build/en/346/