fcm make failed

[amenon]

Hi,
I have imported a new branch into my suite and when I try to run it for a day, then the fcm make in the build_local is failing with a signal error. This is the error that I get:

[FAIL] um/src/atmosphere/dynamics_diagnostics/diab_tracer_mod.F90: merge results in conflict
[FAIL] merge output: /home/amenon/cylc-run/u-av692/share/fcm_make/.fcm-make/extract/merge/um/src/atmosphere/dynamics_diagnostics/diab_tracer_mod.F90.diff
[FAIL] source from location 0: ​svn://puma/um.xm_svn/main/trunk/src/atmosphere/dynamics_diagnostics/diab_tracer_mod.F90@45850
[FAIL] source from location 2: ​svn://puma/um.xm_svn/main/branches/pkg/andymalcolm/vn10.9_all_optimisations/src/atmosphere/dynamics_diagnostics/diab_tracer_mod.F90@50781
[FAIL] !!! source from location 3: ​svn://puma/um.xm_svn/main/branches/dev/claudiosanchez/vn10.9_diab_tr_centralized/src/atmosphere/dynamics_diagnostics/diab_tracer_mod.F90@51521

[FAIL] fcm make -f /home/amenon/cylc-run/u-av692/work/20160701T0000Z/fcm_make/fcm-make.cfg -C /home/amenon/cylc-run/u-av692/share/fcm_make -j 4 —ignore-lock mirror.target=login.archer.ac.uk:cylc-run/u-av692/share/fcm_make mirror.prop{config-file.name}=2 # return-code=2
Received signal ERR
cylc (scheduler - 2018-05-24T14:42:03Z): CRITICAL Task job script received signal ERR at 2018-05-24T14:42:03Z
cylc (scheduler - 2018-05-24T14:42:03Z): CRITICAL failed at 2018-05-24T14:42:03Z

diab_tracer is from the newly added branch. I have done fcm checkout. The new branch is in a directory called branches in my home. Could you please help?

Many thanks

[grenville]

The branches are changing the same bits of code - FCM can not decide what to do. You can see where the problems are in

/home/amenon/cylc-run/u-av692/share/fcm_make/.fcm-make/extract/merge/um/src/atmosphere/dynamics_diagnostics/diab_tracer_mod.F90.diff

The area of conflict is small (in SUBROUTINE diab_tracer_fast) - how to resolve it is not something we can do. The authors of the branches are your best bet.

How did you decide to add these branches?

Grenville

[amenon]

Thanks Grenville. I will check with the author of the branch. Using this branch I am trying to get the PV and theta tracers from my new set of simulations.