Changes between Version 41 and Version 42 of ticket/1851/General
- Timestamp:
- 2017-03-03T17:03:50+01:00 (7 years ago)
Legend:
- Unmodified
- Added
- Removed
- Modified
-
ticket/1851/General
v41 v42 342 342 For now use a WC of Mireks branch for debugging. 343 343 344 345 So after 2 days more glacial progress we arrive at zqsn and zqin diverging after the call to temperature_changes in thermo_vertical. 346 Attempts to put in more write statements just before the call to temperature_changes results in a clash with CICE/branches/dev/hadax/r1205_SIMIP_GSI8. 347 So now we're in exactly the same situation I had when trying to debug NEMO before the package branch was created, where I an unable to effectively debug things 348 due to the extensive list of CICE branches. We have to have a package branch. This cannot be put off any longer. 349 350 SO now I'm forced to create my own package branch - that in itself is a huge pain because r1205_SIMIP_GSI8 is a branch of a branch so I cannot merge that directly into my debug branch, I have to first get hold of its ancestor CICE/branches/dev/hadax/vn5.1.2_GSI8 ! 351 352 Do this (but don't) commit anything! 353 354 Well that was short lived.... I can't merge the two stages of r1205_SIMIP_GSI8 without committing something because the 2nd stage (BOB) of that branch does not share a common ancestor! 355 356 SO basically I've got to create a brand new branch. 357 Then merge in these two stages and commit, then merge all the debugging stuff from my branch somehow! That will take ages to unpick. 358 359 360 361