Opened 11 years ago

Closed 11 years ago

#334 closed help (fixed)

FCM base extract fails

Reported by: rosalindwest Owned by: ros
Component: UM Model Keywords: FCM_CONFLICT
Cc: Platform:
UM Version: 7.1

Description

Hello,

In my job xeisc, I have tried to include modifications from GMann's VN7.1_UKCA_MODE branch at revision number 1979. However, when I try to run this from the UMUI, I get:
FCM_MAIN: Calling Extract
Base extract: Failed.

However, when I use his previous revision number 1916 it extracts fine.

Would it better to merge my branch with Graham's again at the new revision number, rather than including modifications in the FCM Configuration panel in the UMUI?

Thanks,

Rosalind.

Change History (2)

comment:1 Changed 11 years ago by ros

  • Keywords FCM_CONFLICT added
  • Owner changed from um_support to ros
  • Status changed from new to accepted

Hi Rosalind,

If you look in the extract output file ~rosalindwest/um/um_extracts/xeisc/umbase/ext.out you'll see the following error message:

ERROR: UM/atmosphere/UKCA/ukca_chemco.F90: merge - cannot resolve conflicts:
  source[0]=svn://puma/UM_svn/UM/branches/dev/um/VN7.1_machine_cfg/src/atmosphere/UKCA/ukca_chemco.F90@625
  source[1]=svn://puma/UM_svn/UM/branches/dev/gmann/VN7.1_UKCA_MODE/src/atmosphere/UKCA/ukca_chemco.F90@1979
  source[2]=svn://puma/UM_svn/UM/branches/dev/rosalindwest/VN7.1_UKCA_ARG/src/atmosphere/UKCA/ukca_chemco.F90@1913
  cache0=/home/rosalindwest/um/um_extracts/xeisc/umbase/.cache/.ext/UM/atmosphere/UKCA/base__625/ukca_chemco.F90
  cache1=/home/rosalindwest/um/um_extracts/xeisc/umbase/.cache/.ext/UM/atmosphere/UKCA/branch6__1979/ukca_chemco.F90
  cache2=/home/rosalindwest/um/um_extracts/xeisc/umbase/.cache/.ext/UM/atmosphere/UKCA/branch7__1913/ukca_chemco.F90

This indicates that there is a clash between the 2 files

source[1]=svn://puma/UM_svn/UM/branches/dev/gmann/VN7.1_UKCA_MODE/src/atmosphere/UKCA/ukca_chemco.F90@1979
source[2]=svn://puma/UM_svn/UM/branches/dev/rosalindwest/VN7.1_UKCA_ARG/src/atmosphere/UKCA/ukca_chemco.F90@1913

As you say you need to merge Graham's branch into your VN7.1_UKCA_ARG branch and manually resolve the clash.

Instructions on using fcm to resolve clashes can be found at http://puma.nerc.ac.uk/trac/UM_TUTORIAL/wiki/UmTutorial/vn7.1/ResolvingConflicts should you need it.

Any problems let me know.

Regards,
Ros.

comment:2 Changed 11 years ago by ros

  • Resolution set to fixed
  • Status changed from accepted to closed
Note: See TracTickets for help on using tickets.