BISMG:SarahS/jules merge

Notes on merging AW glacier code to current JULES trunk
 * Install tkdiff

1. A copy of the trunk to which changes will be merged to
 * Create 3 directories in the puma repository in my work space to contain

2. Andy Wiltshire's code

3. JULES version 3 from which Andy made his changes

How to sync my branch with the trunk
 * go to the working copy of my branch jules/jules-glacier
 * svn update- ensure there are no differences
 * svn merge https://puma.nerc.ac.uk/svn/JULES_svn/JULES/trunk
 * See if you can build and run a test
 * svn commit -m "Merge latest trunk changes to the jules-glacier branch"

Notes on merging

./tkdiff.exe /home/paleo/ggsrs/jules/r1444_sub_ice/SOURCE/SUBROUTINES/CONTROL/control.f90 /home/paleo/ggsrs/jules/jules-glacier/src/control/standalone/control.F90

Questions for AW


 * What is the purpose of the extract and preprocessor directories?
 * In AW /SOURCE/SUBROUTINES/control.F90 can I remove offline_diag variables ?
 * Subroutine snow has arguments firn_tile, firnT_tile. Do I need these for smb calculations?
 * Do I need subroutine ice to calculate SMB?
 * Where do I insert the switch to turn on elevation for ice tiles? Does AW have a switch for elevation tiles or do switches only relate to ice dynamics ?


 * How to set the number of ice tiles "nice" ? Is there a conflict with sea ice


 * What part of the code does the switch turn on?


 * Change input to read in tile surface heights relative to grid box mean. No need just use existing tile heights stuff
 * In src/control/standaloce/control.F90. ei_tile and melt_tile are already in here so no need to add.

In old jules CALL elevate is in control.F90 twice and in sf_exch.F90. In new jules it is in subroutine sf_exch_jls.F90 only.

What are the bare minimum changes needed to calc smb.