ROMS update

[kate]

One of the recent ROMS updates involves a move of the biology and sediment codes to new directories. This is entirely sensible, but I want to point out that before doing that next "svn update" you might consider making a backup of any personal changes you may have made to either the biology or sediment files. The svn update comes through as a delete of the old files and an adding of the new files.

User beware!

I saw it coming and did a preemptive mv of those files and I'm now faced with some conflicts:

Code: Select all

!     C ROMS/Nonlinear/npzd_Powell.h
      >   local delete, incoming delete upon merge
!     C ROMS/Nonlinear/nemuro.h
      >   local delete, incoming delete upon merge
!     C ROMS/Nonlinear/npzd_Franks.h
      >   local delete, incoming delete upon merge
!     C ROMS/Nonlinear/npzd_iron.h
      >   local delete, incoming delete upon merge

Better this than the alternative!

My advice is to get yourself a personal repository if you are making any changes at all. Maybe try git and git-svn, as I posted to the blog.

[kate]

Newly up: a ROMS git tutorial: https://www.myroms.org/wiki/index.php/ROMS_git.