Opened 10 years ago

Closed 9 years ago

#439 closed help (fixed)

UKCA: problems combining RADAER with nudging

Reported by: kipling Owned by: um_support
Component: UM Model Keywords: NUDGING, CONFLICT
Cc: ptelford,mdalvi,rosalindwest Platform:
UM Version: 7.3

Description

I'm currently trying to add nudging to my job on MONSooN (xevxn), which is an L38 job based on xeunb (the nearest we have to a "standard" 7.3 MODE/RADAER base job, as I understand it).

However, there only seem to be hand-edits for enabling nudging on L60 and L85 jobs. I've adapted these for L38 based on the values used on the 7.1 nudging branch (~kipling/hand_edits/nudging_on_monsoon_l38_std.ed) — should this be adequate, or are any other changes needed?

I'm also having problems with the FCM extract stage, due to a conflict between the RADAER and nudging changes in cntlatm.h:

<<<<<<< 
/home/kipling/um/um_extracts/xevxn/umbase/.cache/.ext/UM/include/common/branch3__3564/cntlatm.h
     &  L_ukca, L_nudging,                                              &
     &  run_relax_uvalue, run_relax_vvalue, run_relax_tvalue,           &
     &  run_model_bottom, run_model_top,                                &
     &  run_turn_on_length_bottom, run_turn_on_length_top,              &
     &  run_pressure_level_scheme,                                      &
=======
     &  L_ukca, L_UKCA_RADAER,                                          &
>>>>>>>

Is there a "standard" solution to this to enable the use of both
branches together as-is, or will I need to create a new branch merging both sets of changes and resolving the conflict(s)?

Cheers,

Zak.

Change History (2)

comment:1 Changed 10 years ago by ros

  • Keywords NUDGING, CONFLICT added

Hi Zak,

With regard to the code clash that you have, the standard way to resolve this is to merge the 2 affected branches together, either by merging one branch into the other or, as you say, by creating a new branch and merging both sets of changes into the new branch. Then you need to resolve the conflict by running

fcm conflicts src/include/common/cntlatm.h

See the conflicts section of the UM Tutorial for further details.
http://puma.nerc.ac.uk/trac/UM_TUTORIAL/wiki/UmTutorial/vn7.1/ResolvingConflicts

I don't know the answer to your nudging question, but hopefully one of my colleagues will be able to give some advice.

Regards,
Ros.

comment:2 Changed 9 years ago by willie

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