NESP2pt9_BLAZE merge in CABLE-POP_TRENDY

[ccarouge]

To consolidate various bodies of work on CABLE, this looks at merging the BLAZE_9184 branch and the CABLE-POP_TRENDY branch. This issue describes the steps taken to achieve this merging and discusses problems that may change the plans.

Goal

The goal is to merge capabilities between the 2 branches. We will try to reproduce the results of the BLAZE_9184 branch although some changes in design might introduce unavoidable differences.
The resulting CABLE-POP_TRENDY needs to keep its current capabilities intact.

Setup

This work will take place in branches stemming from the CABLE-POP_TRENDY branch. It will be integrated into the CABLE-POP_TRENDY branch in instalments.

This pull request shows the differences between the 2 branches. It will update itself as the work progresses.

Testing

We first need to create test cases to compare with:

• 1000pts serial BIOS3 case:

  • using CABLE-POP_TRENDY branch
  • using BLAZE_9184 branch

• ACT9 serial BIOS

• 1000pts + LUC serial BIOS

• BLAZE-activated test cases?

• single site tests with/without POP active

• @juergenknauer to give a list of test cases to ensure we keep the TRENDY functionalities intact.

Work plan

• Create the test cases and set up input data in a shared location.
• Modify the ancillary data format from BIOS to use gridded data. Reformat BIOS ancillary information #281 Unable to run BIOS configuration with POP on in CABLE-POP_TRENDY #321
• Use netcdf format for met forcings in NESP2pt9_BLAZE #233 . Adapt the CABLE-POP_TRENDY subroutines to accommodate the BIOS met forcing inputs.
• BIOS LUC: replace with TRENDY implementation #393
• Update BLAZE in CABLE-POP_TRENDY #392

[mcuntz]

Dear Claire @ccarouge ,

The CABLE-POP_TRENDY branch comes originally from the NESP2pt9_BLAZE branch. There is already the non-finalised BLAZE code in CABLE-POP_TRENDY. Ben Smith convinced Lars Nieradzik to finalise the implementation of BLAZE but this takes a lot of time because Lars is on it only at 1% of his time. Jürgen and I have promised to merge the two codes once Lars has finished the implementation.

Kind regards,
Matthias

[ccarouge]

@mcuntz After meeting with Ian Harman and Jürgen, it appears this work would use the branch where Lars is doing his BLAZE work. We haven't decided yet whether merging in BLAZE in CABLE-POP_TRENDY would be part of this work or to keep it in the BLAZE_9184 branch until Lars's work is done. It depends on how complex the merge would be and we haven't had a look at it yet.

[har917]

Copying comment from #398 here for connectivity:

In preparing for the work to update BLAZE->CABLE-POP_TRENDY I've had to work a little on this. We need to update the LUH2 data for BIOS - in particular the file/variable names have changed for primary_veg and secondary_veg and there maybe new files needed. (I've had to use the 1 degree versions on rp23 just to get the code to run)