Context Navigation

General

-                      v1
+                      v2
+The code development needs to be compatible with the MO GO6 ocean model configuration. This configuration currently features approximately 11 separate code branches which makes further development of additional code
+potentially problematic in terms of a high risk of code conflicts.
+It also needs to be compatible with the MO GC3 coupled model configuration which adds a further 4 NEMO branches.
+While the bulk of the MEDUSA code is self contained under the TOP_SRC directory and thus less prone to causing conflicts, the coupling interface code is
+a very high risk in terms of conflicts since it needs to modify sbccpl.F90 and perhaps other high level coupling routines.
+Oddly we find that the conflicts we see from the MEDUSA coupling interface developments are with code contained in the GO6 definition and not with the coupling specific code added by the extra GC3 branches.
+Specifically, we find that [log:branches/UKMO/dev_r5518_coupling_GSI7_GSI8_landice_bitcomp dev_r5518_coupling_GSI7_GSI8_landice_bitcomp] is a major source of clashes. There is no way to rework the MEDUSA
+interface to avoid this because this branch, although only part of the GO6 configuration, actually features changes relating to coupled models (for reasons of avoiding code clashes!) particularly w.r.t. the magic numbers used for coupled field indexing.