Skip to content

Re-ordering definition of a few parameters in ed_params.f90 #421

Merged
mpaiao merged 3 commits intoEDmodel:masterfrom
mpaiao:mpaiao-pr-202511hotfix
Nov 17, 2025
Merged

Re-ordering definition of a few parameters in ed_params.f90 #421
mpaiao merged 3 commits intoEDmodel:masterfrom
mpaiao:mpaiao-pr-202511hotfix

Conversation

@mpaiao
Copy link
Contributor

@mpaiao mpaiao commented Nov 14, 2025

Description

After merging #411, a few canopy turbulence parameters went uninitialised before being used. This quick pull request moves the initialisation of these derived variables after loading XML parameters, so they are correctly defined.

Collaborators

Types of changes

  • Hot fix (emergential bug fix to make ED2 run again)
  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Other (fix or feature that would cause existing functionality to change)

Changes in Settings, Input Files or Output Files

  • This feature requires changes in ED2IN
  • This feature requires changes in the XML parameter file
  • This feature requires changes in other input files
  • This feature will change output files

Expectation of Answer Changes:

  • No changes expected (bit-for-bit compatibility)
  • Changes expected with specific configurations (see details below)
  • Changes expected in all simulations (see details below)

This fix will prevent crashes when running ED2 with ISFCLYRM=4, but this is a good thing because otherwise some parameters would not be properly initialised.

Checklist:

  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • ED2 Wiki update:

Testing :

  • All new and existing tests passed.

mpaiao and others added 2 commits November 14, 2025 09:40
…sed before being used.

This bug emerged once some turbulence variables were removed from ED2IN.
@mpaiao
Copy link
Contributor Author

mpaiao commented Nov 14, 2025

So all the continuous integration steps are working with this hot fix, but Docker does not seem to be building correctly. @robkooper do you have any idea of what could be the problem? Thanks!

Edit: I tried to add some permission settings to Docker.yml based on this but it did not make any difference. I think the Docker error is not related to the ED2 code itself, so we can go ahead and merge this pull request, but it would be nice to have Docker working again.

@mpaiao mpaiao requested review from mdietze and xiangtaoxu November 14, 2025 18:07
@mpaiao
Copy link
Contributor Author

mpaiao commented Nov 17, 2025

I will go ahead and merge this one without review, because it is a hot fix and I don't want to leave a non-working version as the mainline.

@mpaiao mpaiao merged commit 0624b70 into EDmodel:master Nov 17, 2025
4 of 6 checks passed
@mpaiao mpaiao deleted the mpaiao-pr-202511hotfix branch November 21, 2025 12:07
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.

2 participants