git FABM

I am not familiar with 'git' command, but GOTM and FABM use git to update the models.

Today, I used 'git pull' to check for updated files on FABM and I could see that there are some updates available at least:

~/FABM/fabm-git$ git pull
remote: Counting objects: 504, done.
remote: Compressing objects: 100% (399/399), done.
remote: Total 405 (delta 265), reused 0 (delta 0)
Receiving objects: 100% (405/405), 596.49 KiB | 618 KiB/s, done.
Resolving deltas: 100% (265/265), completed with 71 local objects.
From git://fabm.git.sourceforge.net/gitroot/fabm/fabm
   ce042d4..75702b8  master     -> origin/master
Updating ce042d4..75702b8
error: Your local changes to the following files would be overwritten by merge:
src/fabm_types.F90
testcases/0d/run.nml
Please, commit your changes or stash them before you can merge.
Aborting

The message seems to tell me that the two files listed (fabm_types.F90 and run.nml) will be overwritten if I 'git merge'. I edited 'fabm_types.F90' so that the model would be compiled successfully, so I wouldn't want to overwrite it. Thus, I decided to rename these files *_old.* so that I don't lose them. Then I 'git pull' again:

~/FABM/fabm-git$ git pull

Updating ce042d4..75702b8

Fast-forward

 compilers/compiler.FTN                             |   16 +

 compilers/vs2010/fabm-0d.vfproj                    |   15 +-

 compilers/vs2010/fabm-gotm.vfproj                  |   15 +-

 include/standard_variables.h                       |  232 +++++++

 src/Makefile                                       |    9 +-

 src/Rules.make                                     |    8 +

 src/drivers/0d/fabm0d.F90                          |   55 +-

 src/drivers/gotm/Makefile                          |   11 +-

 src/drivers/mossco/Makefile                        |    9 +-

 src/fabm.F90                                       |  167 ++++-

 src/fabm_expressions.F90                           |  123 ++++

 src/fabm_library.F90                               |    8 +

 src/fabm_standard_variables.F90                    |  193 +-----

 src/fabm_types.F90                                 |   93 ++-

 src/models/aed/Makefile                            |    6 +-

 src/models/aed/aed_bacteria.F90                    |    4 +-

 src/models/aed/aed_carbon.F90                      |   16 +-

 src/models/aed/aed_chlorophylla.F90                |    8 +-

 src/models/aed/aed_iron.F90                        |    2 +-

 src/models/aed/aed_nitrogen.F90                    |    6 +-

 src/models/aed/aed_organic_matter.F90              |   26 +-

 src/models/aed/aed_oxygen.F90                      |   18 +-

 src/models/aed/aed_pathogens.F90                   |   18 +-

 src/models/aed/aed_phosphorus.F90                  |   30 +-

 src/models/aed/aed_phytoplankton.F90               |  120 ++--

 src/models/aed/aed_sedflux.F90                     |    2 +-

 src/models/aed/aed_silica.F90                      |    4 +-

 src/models/aed/aed_sulfur.F90                      |    2 +-

 src/models/aed/aed_tracer.F90                      |    6 +-

 src/models/aed/aed_util.F90                        |    8 +-

 src/models/aed/aed_viruses.F90                     |    4 +-

 src/models/aed/aed_zooplankton.F90                 |   70 +--

 src/models/au/prey_predator/Makefile               |    2 +

 src/models/au/prey_predator/prey_predator.F90      |    4 +-

 src/models/bb/Makefile                             |    1 +

 src/models/bb/filter_feeder/Makefile               |   26 +

 src/models/bb/filter_feeder/filter_feeder.F90      |  166 +++++

 src/models/bb/passive/Makefile                     |    2 +

 src/models/examples/Makefile                       |    1 +

 src/models/examples/benthic_predator/Makefile      |    2 +

 .../examples/benthic_predator/benthic_predator.F90 |    2 +-

 src/models/examples/duplicator/Makefile            |    2 +

 src/models/examples/mean/Makefile                  |   26 +

 src/models/examples/mean/mean.F90                  |   84 +++

 src/models/examples/npzd/Makefile                  |    2 +

 src/models/examples/npzd/phy.F90                   |   10 +-

 src/models/examples/npzd/zoo.F90                   |    8 +-

 src/models/examples/npzd_f2003/Makefile            |    2 +

 src/models/examples/npzd_f2003/npzd_f2003.F90      |   12 +-

 src/models/gotm/Makefile                           |    1 +

 src/models/{iow => gotm}/ergom/Makefile            |    7 +-

 src/models/{iow => gotm}/ergom/ergom.F90           |  638 +++++++-------------

 src/models/gotm/fasham/Makefile                    |    2 +

 src/models/gotm/fasham/fasham.F90                  |    2 +-

 src/models/gotm/npzd/Makefile                      |    2 +

 src/models/gotm/npzd/npzd.F90                      |   10 +-

 src/models/hzg/omexdia_p/Makefile                  |    2 +

 src/models/hzg/omexdia_p/omexdia_p.F90             |   20 +-

 src/models/iow/Makefile                            |    3 +-

 src/models/iow/spm/Makefile                        |    2 +

 src/models/iow/spm/spm.F90                         |  550 ++++++++++++++---

 src/models/klimacampus/phy_feedback/Makefile       |    2 +

 .../klimacampus/phy_feedback/phy_feedback.F90      |   14 +-

 src/models/metu/mnemiopsis/Makefile                |    2 +

 src/models/metu/mnemiopsis/mnemiopsis.F90          |   24 +-

 src/models/pml/carbonate/Makefile                  |    2 +

 src/models/pml/carbonate/carbonate.F90             |   10 +-

 src/models/pml/ersem/Makefile                      |    2 +

 src/models/pml/ersem/ersem.F90                     |    8 +-

 testcases/0d/run.nml                               |    1 +

 testcases/fabm-bb-filter_feeder.nml                |   84 +++

 .../{fabm-iow-ergom.nml => fabm-gotm-ergom.nml}    |    4 +-

 .../standard_variables/parse_standard_variables.py |   32 +-

 73 files changed, 2062 insertions(+), 1018 deletions(-)

 create mode 100644 compilers/compiler.FTN

 create mode 100644 include/standard_variables.h

 create mode 100644 src/fabm_expressions.F90

 create mode 100644 src/models/bb/filter_feeder/Makefile

 create mode 100644 src/models/bb/filter_feeder/filter_feeder.F90

 create mode 100644 src/models/examples/mean/Makefile

 create mode 100644 src/models/examples/mean/mean.F90

 rename src/models/{iow => gotm}/ergom/Makefile (71%)

 rename src/models/{iow => gotm}/ergom/ergom.F90 (50%)

 mode change 100644 => 100755 src/models/iow/spm/spm.F90

 create mode 100644 testcases/fabm-bb-filter_feeder.nml

 rename testcases/{fabm-iow-ergom.nml => fabm-gotm-ergom.nml} (99%)

This time, it started updating the model right away and gives me all the details about the update.

I wonder how to update the model without losing my own modification in the code(s) being updated...