merge soilsnow from AM3

[JhanSrbinovsky]

No description provided.

[ccarouge]

@har917 Looking at the changes for groundwater, there is an extra place with the ice density being added that is not in AM3. It's not in soilsnow and it's not from AM3 code but do we want to add it and do we want to add it in the same PR as the changes here?

For this line:

CABLE/src/science/canopy/cbl_latent_heat.F90

Line 214 in d744c2f

fupper_limit(j) = REAL(ssnow_wb(j)-ssnow_wbice(j)/frozen_limit)*frescale(j)

GW code changes to ssnow_wb - ssnow_wbice*den_rat..... den_rat is the ratio of ice and liquid densities.

[har917]

@ccarouge Ideally yes - this fix should go in with the rest of the ice stuff. However I'd like to consolidate codebases and this would sit across AM3 and CABLE3/ESM1.6 and we have lots of moving parts already.

[JhanSrbinovsky]

I fear the moving parts on top of moving parts issue is making this very difficult. If we can get this #494 into main and I think it is only 2PRs on the ESM16 side that @har917 is in the middle of looking at 60+ years of output (now maybe 3 because I've just thrown the wood thinning into the mix - although this doesnt exist on the CABLE :main side anyway[so safe to ignore for now]). This would make reconciling UM7's CABLE and CABLE:main much "easier".

[har917]

Tilo wants us to consolidate around a codebase and merge ocean code, parameters + land code (including LUH3) into a new long run asap.

So my basic position would be - yes this is correct, I don't think it will make much (if any) difference because of other catches - so I'd delay and bringing it in as a separate issue later.