Opened 4 years ago

Closed 4 years ago

#1761 closed help (fixed)

fcm merge for NEMO

Reported by: cthomas Owned by: annette
Component: FCM Keywords: NEMO
Cc: Platform: MONSooN
UM Version: <select version>

Description

Hi,

I have been trying to add a new branch to NEMO for use in a Rose suite on Monsoon. In this case the base version of NEMO is 3.4 but there are already several branches on top of it. My aim is to change two of the .F90 files but leave the rest as they are. On Puma I did the following (just considering one of the files):

fcm branch-create sstbias fcm:nemo-tr@vn3.4
fcm checkout fcm:nemo-br/dev/cthomas/vn3.4_sstbias
make the changes to NEMOGCM/NEMO/OPA_SRC/OBS/diaobs.F90
fcm merge fcm:nemo-br/dev/deazer/vn3.4_OBS_NEMOVAR_community_UKMO
accept the new changes in diaobs.F90
fcm commit

Then I edited the Rose suite on Monsoon. In the fcm option "extract.location{diff}[nemo]", I removed the line

branches/dev/deazer/vn3.4_OBS_NEMOVAR_community_UKMO@5408

and added

branches/dev/cthomas/vn3.4_sstbias@5459

When compiling, however, I get lots of errors about files missing. It looks like the merge didn't do quite what I wanted. I guess I've missed an important step somewhere - if you had any advice I'd be very grateful. I can make files available somewhere public if that's useful.

Cheers,
Chris

Change History (3)

comment:1 Changed 4 years ago by annette

Hi Chris,

It looks like the merge was successful. I'm not sure if this is just a typo in your ticket but the revision of your new sstbias branch should be 5460 to include the merge.

If you are still having problems can you give your suite-id so I can look at the log files.

Best wishes,
Annette

comment:2 Changed 4 years ago by annette

  • Status changed from new to pending

comment:3 Changed 4 years ago by cthomas

  • Resolution set to fixed
  • Status changed from pending to closed

Hi Annette,

That was it, many thanks!
Cheers,
Chris

Note: See TracTickets for help on using tickets.