Skip to content

Conversation

@JhanSrbinovsky
Copy link
Collaborator

@JhanSrbinovsky JhanSrbinovsky commented Oct 22, 2025

CABLE

Thank you for submitting a pull request to the CABLE Project.

Description

Received arg declared erroneously. Rather than resolve only need to send current ittteration (from define_canopy() ) part of the array anyway.

see #521

Fixes #521

Type of change

Please delete options that are not relevant.

  • Bug fix

Testing

  • Are the changes bitwise-compatible with the main branch? If working on an optional feature, are the results bitwise-compatible when this feature is off? If yes, copy benchcab output showing successful completion of the bitwise compatibility tests or equivalent results below this line.

📚 Documentation preview 📚: https://cable--635.org.readthedocs.build/en/635/

@JhanSrbinovsky JhanSrbinovsky changed the title pass tier-ith iteration of zetar pass iter-ith iteration of zetar Oct 22, 2025
@JhanSrbinovsky
Copy link
Collaborator Author

testing:

2025-10-23 09:16:48,868 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S1_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S1_out.nc are identical
2025-10-23 09:16:49,070 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S0_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S0_out.nc are identical
2025-10-23 09:16:50,214 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S1_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S1_out.nc are identical
2025-10-23 09:16:50,421 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S3_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S3_out.nc are identical
2025-10-23 09:16:50,423 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S2_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S2_out.nc are identical
2025-10-23 09:16:50,454 - INFO - comparison.comparison.py:73 - Success: files AU-Tum_2002-2017_OzFlux_Met_R0_S0_out.nc AU-Tum_2002-2017_OzFlux_Met_R1_S0_out.nc are identical
2025-10-23 09:17:00,123 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S0_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S0_out.nc are identical
2025-10-23 09:17:00,163 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S3_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S3_out.nc are identical
2025-10-23 09:17:00,677 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S1_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S1_out.nc are identical
2025-10-23 09:17:01,738 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S3_out.nc AU-How_2003-2017_OzFlux_Met_R1_S3_out.nc are identical
2025-10-23 09:17:01,791 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S1_out.nc AU-How_2003-2017_OzFlux_Met_R1_S1_out.nc are identical
2025-10-23 09:17:01,877 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S0_out.nc AU-How_2003-2017_OzFlux_Met_R1_S0_out.nc are identical
2025-10-23 09:17:02,303 - INFO - comparison.comparison.py:73 - Success: files US-Var_2001-2014_FLUXNET2015_Met_R0_S2_out.nc US-Var_2001-2014_FLUXNET2015_Met_R1_S2_out.nc are identical
2025-10-23 09:17:05,799 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S2_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S2_out.nc are identical
2025-10-23 09:17:07,416 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S3_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S3_out.nc are identical
2025-10-23 09:17:08,447 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S2_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S2_out.nc are identical
2025-10-23 09:17:08,664 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S0_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S0_out.nc are identical
2025-10-23 09:17:08,948 - INFO - comparison.comparison.py:73 - Success: files FI-Hyy_1996-2014_FLUXNET2015_Met_R0_S1_out.nc FI-Hyy_1996-2014_FLUXNET2015_Met_R1_S1_out.nc are identical
2025-10-23 09:17:10,640 - INFO - comparison.comparison.py:73 - Success: files US-Whs_2008-2014_FLUXNET2015_Met_R0_S3_out.nc US-Whs_2008-2014_FLUXNET2015_Met_R1_S3_out.nc are identical
2025-10-23 09:17:11,194 - INFO - comparison.comparison.py:73 - Success: files AU-How_2003-2017_OzFlux_Met_R0_S2_out.nc AU-How_2003-2017_OzFlux_Met_R1_S2_out.nc are identical
2025-10-23 09:17:11,238 - INFO - benchcab.benchcab.py:391 - 0 failed, 20 passed

@JhanSrbinovsky JhanSrbinovsky marked this pull request as ready for review October 22, 2025 22:27
Copy link
Member

@ccarouge ccarouge left a comment

Choose a reason for hiding this comment

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

I'm happy with the canopy stuff but I'm not sure why there are changes to biogeochem_casa in this PR.

Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't the changes for cable_runtime%esm15 come separately? There is no link with the iter stuff in cbl_friction_vel.F90

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

yeah don't know how these got mixed up. I'm sure there was another PR with this stuff in

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

strange - I went to revert it, it didn't like that - so I just compared it to another local version of the file and the change wasn't even there. I pushed - it refreshed GH - and the change is gone. Of course I could've done it yesterday and just forgotten about it

@ccarouge
Copy link
Member

@JhanSrbinovsky another question: is this coming from UM7?

@JhanSrbinovsky
Copy link
Collaborator Author

@JhanSrbinovsky another question: is this coming from UM7?

The change in CASA?

In general? No nothing from me is UM7 anymore. (I've been doing other things. urban model in AM3 being the most exciting) Hopefully we'll swap in the library soon and then. just keep updating that. Although there was a comment on an outstanding issue (probably in UM7) about making this simplification to avoid a potential bug in re-declaration of zetar as (mp, iter) when it should be mp, niter. It never actually caused a problem (I think) but we can avoid it entirely

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.

Passing of iter and niter in compute friction velocity subroutine

3 participants