Merging NOC developments for 2011

Branches to be merged:

dev_r2782_NOCS_Griffies            [added to merge at changeset 2980]
dev_r2787_NOCS_NEPTUNE             [added to merge at changeset 2986]
dev_r2802_NOCS_vvlfix              [added to merge at changeset 3008]
dev_r2855_NOCS_mppsca              [added to merge at changeset 3009] Note: ignored trunk changes between 2802 and 2855; merge still based on 2802; see notes on step 7

dev_r2802_NOCL_bfrimp              [added to merge at changeset 3072]
dev_r2802_NOCL_prjhpg              [added to merge at changeset 3074]
dev_r2802_NOCL_Smagorinsky         [postponed to 2012]
dev_r2802_NOCL_vppm                [postponed to 2012]

Step 1. copy trunk at lowest revision number used by any of the branches to be merged

svn copy svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
         svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_NOC_2011_MERGE \
         -m"Create branch for the merge of all NOC 2011 developments. See ticket #874. Step 1: copy trunk at lowest revision number used by any of the branches to be merged"

Successfully created new branch: branches/2011/dev_NOC_2011_MERGE

Step 2. merge in changes from the first development branch into a checked out version of the merge branch. This simply recreates the first development branch but consolidates the changes made on that branch into a single changeset:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2782_NOCS_Griffies \
          dev_NOC_2011_MERGE

--- Merging r2783 through r2979 into 'dev_NOC_2011_MERGE':
U    dev_NOC_2011_MERGE/DOC/TexFiles/Namelist/namtra_ldf
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/CONFIG/POMME/EXP00/namelist
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
U    dev_NOC_2011_MERGE/NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90

NOTE: STILL SOME DOCUMENTATION CHANGES NEEDED FOR THIS BRANCH

Check in merge branch:

cd dev_NOC_201_MERGE
svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 2: Add changes from the 2011/dev_r2782_NOCS_Griffies branch"

Sending        DOC/TexFiles/Namelist/namtra_ldf
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldftra_oce.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/eosbn2.F90
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf_iso_grif.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcadv.F90
Sending        NEMOGCM/NEMO/TOP_SRC/TRP/trcldf.F90
Transmitting file data ............
Committed revision 2980.

Step 3. Merge in trunk changes between trunk@2782 and trunk@2787. Check-in changes if no conflicts arise

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2782 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          ./
 
--- Merging r2783 through r2787 into '.':
U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
U    NEMOGCM/NEMO/OFF_SRC/domrea.F90
U    NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
U    NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90
U    NEMOGCM/NEMO/TOP_SRC/oce_trc.F90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 3: Merge in trunk changes between revision 2782 and 2787" 

Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/cpp_ORCA2_OFF_PISCES.fcm
Sending        NEMOGCM/NEMO/OFF_SRC/domrea.F90
Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcrnf.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfmxl.F90
Sending        NEMOGCM/NEMO/TOP_SRC/MY_TRC/trcini_my_trc.F90
Sending        NEMOGCM/NEMO/TOP_SRC/oce_trc.F90
Transmitting file data ......
Committed revision 2985.

Step 4. Merge in all changes on the NOCS_NEPTUNE branch. Revert the cpp_ORCA2_LIM.fcm file that shouldn't have been changed. Check-in if no conflicts arise:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2787_NOCS_NEPTUNE \
          ./

--- Merging r2791 through r2985 into '.':
U    DOC/TexFiles/Biblio/Biblio.bib
U    DOC/TexFiles/Chapters/Chap_DYN.tex
A    DOC/TexFiles/Namelist/namdyn_nept
U    NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
U    NEMOGCM/CONFIG/POMME/EXP00/namelist
U    NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm
U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
A    NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90
U    NEMOGCM/NEMO/OPA_SRC/step.F90

svn revert NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm
Reverted 'NEMOGCM/CONFIG/ORCA2_LIM/cpp_ORCA2_LIM.fcm'

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 4: Merge in changes from 2011/dev_r2787_NOCS_NEPTUNE branch"
 
Sending        DOC/TexFiles/Biblio/Biblio.bib
Sending        DOC/TexFiles/Chapters/Chap_DYN.tex
Adding         DOC/TexFiles/Namelist/namdyn_nept
Sending        NEMOGCM/ARCH/arch-ALTIX_NAUTILUS4.fcm
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Adding         NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90
Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Sending        NEMOGCM/NEMO/OPA_SRC/step.F90
Transmitting file data .........
Committed revision 2986.

Step 5. Merge in trunk changes between trunk@2787 and trunk@2802. Check-in changes if no conflicts arise

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2787 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
          ./
 
--- Merging r2788 through r2802 into '.':
U    NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 5: Merge in trunk changes between revision 2787 and 2802" 

Sending        NEMOGCM/NEMO/NST_SRC/agrif_opa_update.F90
Transmitting file data .
Committed revision 3001.

Step 6. Merge in all changes on the NOCS_vvlfix branch. Check-in if no conflicts arise:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_NOCS_vvlfix \
          ./

--- Merging r2806 through r3007 into '.':
U    NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
U    NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 6: Merge in changes from 2011/dev_r2802_NOCS_vvlfix branch"

Sending        NEMOGCM/NEMO/OPA_SRC/DOM/domvvl.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DOM/istate.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynnxt.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
Transmitting file data ....
Committed revision 3008.

Step 7. Merge in all changes on the NOCS_mppsca branch. Note this will ignore any trunk changes between revisions 2802 and 2855. Those changes only concerned:

NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

so no conflicts will occur if these changes are added later. Continue to treat the merge branch as being based on trunk revision 2802 (which means the NOCL branches can be added (IF they are ready in time!) and the later trunk changes included afterwards. Check-in if no conflicts arise:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855 \
           svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2855_NOCS_mppsca \
           ./

--- Merging r2881 through r3008 into '.':
U    DOC/TexFiles/Chapters/Chap_MISC.tex
U    NEMOGCM/CONFIG/GYRE/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
U    NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
U    NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
U    NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
U    NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 7: Merge in changes from 2011/dev_r2855_NOCS_mppsca branch"

Sending        DOC/TexFiles/Chapters/Chap_MISC.tex
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lbcnfd.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Transmitting file data .......
Committed revision 3009.

Step 8. Start SETTE testing. The merge is incomplete but NOCL developments are still unfinished. Testing cannot be delayed if a robust merge is going to ready for the merge event in two weeks time! Problems are uncovered immediately with the mppsca branch not having been tested (obviously) in single processor mode. Simply fixed by making sure nemo_northcomms is an empty routine if key_mpp_mpi is not set and ln_nnogather is defined (and .false.) in the alternative part of lib_mpp.F90. Compilation problem also evident in dynnept.F90 during POMME tests; missing obc_oce use statement. Corrections made and submitted.

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 8: minor corrections for single processor running as uncovered during SETTE testing"

Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90
Sending        NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
Transmitting file data ...
Committed revision 3027.

Step 9. Complete SETTE testing. Discovered one incorrect namelist associated with the NEPTUNE changes (the Neptune effect was erroneously switched on by default). Also uncovered a bug in traldf_lap.F90 when attempting to isolate differences by running without key_ldfslp. tra_ldf_lap is called twice when using passive tracers and requires checks to avoid attempts to allocate saved arrays again on the second call. Fixed on this merge branch.

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 9: minor corrections required for full SETTE compliance (includes small bug fix to traldf_lap.F90 which was uncovered during investigations)"

Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/TRA/traldf_lap.F90
Transmitting file data ..
Committed revision 3044.

This merge branch now passes SETTE tests 1 to 6, i.e.:

 Test 1 : GYRE_LOBSTER     aka GYRELOB_LONG     experiments LONG      followed by SHORT      - restartability single processor   - passed
 Test 2 : ORCA2_LIM_PISCES aka ORCA2LIMPIS_LONG experiments LONG      followed by SHORT      - restartability single processor   - passed
 Test 3 : POMME            aka POMME_LONG       experiments LONG      followed by SHORT      - restartability single processor   - failed (but consistent with the trunk) see note 1
 Test 4 : GYRE_LOBSTER     aka GYRELOB_4        experiments REPRO_1_4 followed by REPRO_2_2  -  4 processor reproducibility      - failed (but consistent with the trunk) see note 2
 Test 5 : ORCA2_LIM_PISCES aka ORCA2LIMPIS_16   experiments REPRO_4_4 followed by REPRO_2_8  - 16 processor reproducibility      - failed (but consistent with the trunk) see note 3
 Test 6 : POMME            aka POMME_4          experiments REPRO_1_4 followed by REPRO_2_2  -  4 processor reproducibility      - passed (perfect reproducibility!)
 Test 7,8 AGRIF untestable (not compilable with intel 10.1 compiler)

and (when using -O1 optimisation level) the resulting solver.stat files all agree with those from a pure trunk version at revision 2855

However, retesting with the intel 11.1 compiler and -O0 optimisation does allow success in all but the POMME restartability test:

./sette_rpt
GYRELOB     restartability  passed
ORCA2LIMPIS restartability  passed
POMME       restartability  FAILED
GYRELOB     reproducibility passed
ORCA2LIMPIS reproducibility passed
POMME       reproducibility passed

Step 10. Merge in changes from the 2011/dev_r2802_NOCL_bfrimp branch; revert and remove unwanted changes; resolve conflicits in dynspg_ts.F90; check in changes:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_NOCL_bfrimp

--- Merging r2806 through r3057 into '.':

A    NEMOGCM/ARCH/arch-pgf90_mobius.fcm 
A    NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm 
A    NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 
A    NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
U    DOC/TexFiles/Chapters/Chap_ZDF.tex
U    DOC/NEMO_book.pdf
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
C    NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
U    NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90

svn revert DOC/NEMO_book.pdf
svn revert NEMOGCM/ARCH/arch-pgf90_mobius.fcm
svn revert NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm
svn revert NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90
svn revert NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
svn revert NEMOGCM/NEMO/OPA_SRC/par_oce.F90
rm NEMOGCM/ARCH/arch-pgf90_mobius.fcm NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90 
svn resolved NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 10. Merge in changes from dev_r2802_NOCL_bfrimp branch (plus some additions and conflicit resolutions)"

Sending        DOC/TexFiles/Chapters/Chap_ZDF.tex
Sending        DOC/TexFiles/Namelist/nambfr
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynbfr.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynzdf_imp.F90
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_ts.F90
Sending        NEMOGCM/NEMO/OPA_SRC/ZDF/zdfbfr.F90
Transmitting file data ...
Committed revision 3072.

Step 11. Merge in changes from the dev_r2802_NOCL_prjhpg branch; revert unwanted changes and remove unwanted additions; add missing namelist changes; partially impose coding standards and add a first attempt at documentation:

svn merge  svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2011/dev_r2802_NOCL_prjhpg
 
--- Merging r2836 through r3073 into '.':
A    NEMOGCM/ARCH/arch-pgf90_mobius.fcm
A    NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm
U    NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
A    NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90
U    NEMOGCM/NEMO/OPA_SRC/par_oce.F90
A    NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90

svn revert NEMOGCM/ARCH/arch-pgf90_mobius.fcm NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 NEMOGCM/NEMO/OPA_SRC/par_oce.F90 NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90
Reverted 'NEMOGCM/ARCH/arch-pgf90_mobius.fcm'
Reverted 'NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm'
Reverted 'NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90'
Reverted 'NEMOGCM/NEMO/OPA_SRC/par_oce.F90'
Reverted 'NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90'

rm NEMOGCM/ARCH/arch-pgf90_mobius.fcm NEMOGCM/ARCH/arch-gfortran_ubuntu.fcm NEMOGCM/NEMO/OPA_SRC/par_AMM7.h90 NEMOGCM/NEMO/OPA_SRC/par_AMM12.h90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 11. Merge in changes from the dev_r2802_NOCL_prjhpg. Partially imposed coding standards (more could be done); added missing namelist changes and added first attempt at documentation"
Password: 

Sending        DOC/TexFiles/Chapters/Chap_DYN.tex
Sending        DOC/TexFiles/Namelist/namdyn_hpg
Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/1_namelist
Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/namelist
Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
Sending        NEMOGCM/CONFIG/POMME/EXP00/namelist
Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
Transmitting file data ........
Committed revision 3074.

Step 12. Merge in trunk changes between revisions 2802 and 2855. Check if no conflicits arise:

svn merge svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2802 \
          svn+ssh://acc@forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@2855
 
--- Merging r2803 through r2855 into '.':
U    NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
U    NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 12. Merge in trunk changes between revision 2802 and 2855. This branch is now ready for the 2011 merge."

Sending        NEMOGCM/NEMO/LIM_SRC_2/iceini_2.F90
Sending        NEMOGCM/NEMO/LIM_SRC_2/limistate_2.F90
Transmitting file data ..
Committed revision 3075.

Step 13. Add some late bugfixes. A minor one for ldfslp.F90 from the Griffies branch and a more significant set for dynhpg.F90 from the prjhpg branch:

svn ci -m"Branch dev_NOC_2011_MERGE. Minor correction to ldfslp (Griffies)"

Sending        NEMOGCM/NEMO/OPA_SRC/LDF/ldfslp.F90
Transmitting file data ........
Committed revision 3077

svn ci -m"Branch dev_NOC_2011_MERGE. #874. Step 13. Additional bugfixes to dynhpg.F90 from the dev_r2802_NOCL_prjhpg branch."

Sending        NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90
Transmitting file data ........
Committed revision 3081

Step 14. Reconfirm that the (provisionally) final version (3081) passes the SETTE tests (based on comparsion of solver.stat files):

./sette_rpt
GYRELOB     restartability  passed
ORCA2LIMPIS restartability  passed
GYRELOB     reproducibility passed
ORCA2LIMPIS reproducibility passed
POMME       reproducibility passed


Notes referring to the unsuccessful SETTE tests with -O1 optimisation:

Note 1. The POMME restartability test fails but the behaviour is identical between the merge branch and the trunk. The divergence in solver.stat values at the restart is immediate:

 ./WPOMME_LONG/ALTIX_NAUTILUS_MPT/20111104/SHORT/solver.stat
it:     301 iter: 450 r: 0.9297678211E-05 b: 0.2376810916E+01
it:     302 iter: 450 r: 0.9692588073E-05 b: 0.1548593371E+01
it:     303 iter: 460 r: 0.8941977945E-05 b: 0.2331042141E+01
it:     304 iter: 460 r: 0.9125984634E-05 b: 0.1530829269E+01
it:     305 iter: 460 r: 0.8935825707E-05 b: 0.1299890232E+01
it:     306 iter: 460 r: 0.8556845848E-05 b: 0.1204770190E+01
it:     307 iter: 450 r: 0.9862845070E-05 b: 0.1174721219E+01
it:     308 iter: 450 r: 0.9726381253E-05 b: 0.1133441908E+01
it:     309 iter: 450 r: 0.9981715955E-05 b: 0.1339529123E+01
it:     310 iter: 460 r: 0.9109525263E-05 b: 0.1319351441E+01

 ./WPOMME_LONG/ALTIX_NAUTILUS_MPT/20111104/LONG/solver.stat
it:     301 iter: 450 r: 0.9334755077E-05 b: 0.1090139022E+01
it:     302 iter: 450 r: 0.9715316646E-05 b: 0.1319934062E+01
it:     303 iter: 460 r: 0.8959914057E-05 b: 0.1231224545E+01
it:     304 iter: 460 r: 0.9112034782E-05 b: 0.1254278874E+01
it:     305 iter: 460 r: 0.8771693448E-05 b: 0.1131659571E+01
it:     306 iter: 460 r: 0.8433151143E-05 b: 0.1173056286E+01
it:     307 iter: 450 r: 0.9817142594E-05 b: 0.1132639311E+01
it:     308 iter: 450 r: 0.9588519414E-05 b: 0.1087043827E+01
it:     309 iter: 450 r: 0.9828679587E-05 b: 0.1305275801E+01

Note 2. The Gyre-lobster reproducibility tests show divergence after 4 timesteps. Again the results are identical between the merge branch and the trunk:

sdiff -W ./WGYRELOB_4/ALTIX_NAUTILUS_MPT/20111104/REPRO_2_2/solver.stat ./WGYRELOB_4/ALTIX_NAUTILUS_MPT/20111104/REPRO_1_4/solver.stat
it:       1 iter: 230 r: 0.7440246784E-05 b: 0.1840836680E+00   it:       1 iter: 230 r: 0.7440246784E-05 b: 0.1840836680E+00
it:       2 iter: 250 r: 0.9359393517E-05 b: 0.2352851007E+00   it:       2 iter: 250 r: 0.9359393517E-05 b: 0.2352851007E+00
it:       3 iter: 230 r: 0.7005363115E-05 b: 0.3162911328E+00   it:       3 iter: 230 r: 0.7005363115E-05 b: 0.3162911328E+00
it:       4 iter: 250 r: 0.7962814044E-05 b: 0.7601032031E+00   it:       4 iter: 250 r: 0.7962814044E-05 b: 0.7601032031E+00
it:       5 iter: 230 r: 0.6855907492E-05 b: 0.8309767148E+00 | it:       5 iter: 230 r: 0.6855907491E-05 b: 0.8309767148E+00
it:       6 iter: 230 r: 0.7077062769E-05 b: 0.9603183656E+00   it:       6 iter: 230 r: 0.7077062769E-05 b: 0.9603183656E+00
it:       7 iter: 230 r: 0.7985748696E-05 b: 0.8953715678E+00 | it:       7 iter: 230 r: 0.7985748694E-05 b: 0.8953715677E+00
it:       8 iter: 220 r: 0.9455647859E-05 b: 0.9261955637E+00 | it:       8 iter: 220 r: 0.9455647851E-05 b: 0.9261955637E+00
it:       9 iter: 220 r: 0.7651648222E-05 b: 0.8648134451E+00 | it:       9 iter: 220 r: 0.7651648235E-05 b: 0.8648134450E+00
it:      10 iter: 230 r: 0.6612104790E-05 b: 0.8296267849E+00 | it:      10 iter: 230 r: 0.6612104802E-05 b: 0.8296267850E+00
it:      11 iter: 230 r: 0.6616268969E-05 b: 0.7733380713E+00 | it:      11 iter: 230 r: 0.6616268977E-05 b: 0.7733380712E+00
.
.
it:      59 iter: 240 r: 0.7258676150E-05 b: 0.7110794672E+00 | it:      59 iter: 240 r: 0.7258676204E-05 b: 0.7110794765E+00
it:      60 iter: 240 r: 0.8918748029E-05 b: 0.6383758115E+00 | it:      60 iter: 240 r: 0.8918748270E-05 b: 0.6383757969E+00

Note 3. The ORCA2LIM- Pisces reproducibility test shows more reluctant divergence than the Gyre-lobster test. Again results are consistent between the merge branch and trunk:

sdiff ./WORCA2LIMPIS_16/ALTIX_NAUTILUS_MPT/20111104/REPRO_4_4/solver.stat ./WORCA2LIMPIS_16/ALTIX_NAUTILUS_MPT/20111104/REPRO_2_8/solver.stat
it:       1 iter: 187 r: 0.3987779903E-03 b: 0.4273062303E+03   it:       1 iter: 187 r: 0.3987779903E-03 b: 0.4273062303E+03
it:       2 iter: 315 r: 0.4169641661E-03 b: 0.4266302968E+03   it:       2 iter: 315 r: 0.4169641661E-03 b: 0.4266302968E+03
it:       3 iter: 299 r: 0.4366129842E-03 b: 0.4440535475E+03   it:       3 iter: 299 r: 0.4366129842E-03 b: 0.4440535475E+03
it:       4 iter: 331 r: 0.1482440885E-03 b: 0.1525211840E+03   it:       4 iter: 331 r: 0.1482440885E-03 b: 0.1525211840E+03
it:       5 iter: 313 r: 0.9257210731E-04 b: 0.9529269826E+02   it:       5 iter: 313 r: 0.9257210731E-04 b: 0.9529269826E+02
it:       6 iter: 300 r: 0.9986353863E-04 b: 0.1014881488E+03   it:       6 iter: 300 r: 0.9986353863E-04 b: 0.1014881488E+03
it:       7 iter: 299 r: 0.1212648628E-03 b: 0.1221632489E+03   it:       7 iter: 299 r: 0.1212648628E-03 b: 0.1221632489E+03
it:       8 iter: 282 r: 0.1049258267E-03 b: 0.1076257978E+03   it:       8 iter: 282 r: 0.1049258267E-03 b: 0.1076257978E+03
it:       9 iter: 271 r: 0.1045781863E-03 b: 0.1078696153E+03   it:       9 iter: 271 r: 0.1045781863E-03 b: 0.1078696153E+03
it:      10 iter: 252 r: 0.1041328551E-03 b: 0.1091242314E+03   it:      10 iter: 252 r: 0.1041328551E-03 b: 0.1091242314E+03
it:      11 iter: 261 r: 0.9636285077E-04 b: 0.1016351232E+03   it:      11 iter: 261 r: 0.9636285077E-04 b: 0.1016351232E+03
it:      12 iter: 255 r: 0.8875921058E-04 b: 0.8986632830E+02   it:      12 iter: 255 r: 0.8875921058E-04 b: 0.8986632830E+02
it:      13 iter: 257 r: 0.7526927571E-04 b: 0.7719481032E+02   it:      13 iter: 257 r: 0.7526927571E-04 b: 0.7719481032E+02
it:      14 iter: 251 r: 0.6497637073E-04 b: 0.6559874146E+02   it:      14 iter: 251 r: 0.6497637073E-04 b: 0.6559874146E+02
it:      15 iter: 249 r: 0.5464159123E-04 b: 0.5864780983E+02   it:      15 iter: 249 r: 0.5464159123E-04 b: 0.5864780983E+02
it:      16 iter: 246 r: 0.5569991429E-04 b: 0.6038138420E+02   it:      16 iter: 246 r: 0.5569991429E-04 b: 0.6038138420E+02
it:      17 iter: 245 r: 0.6925357787E-04 b: 0.6936334013E+02 | it:      17 iter: 245 r: 0.6925357788E-04 b: 0.6936334013E+02
it:      18 iter: 246 r: 0.7403014257E-04 b: 0.8422988383E+02 | it:      18 iter: 246 r: 0.7403014256E-04 b: 0.8422988383E+02
it:      19 iter: 243 r: 0.9349375979E-04 b: 0.9573249033E+02 | it:      19 iter: 243 r: 0.9349375982E-04 b: 0.9573249033E+02
it:      20 iter: 222 r: 0.1170571822E-03 b: 0.1172431558E+03   it:      20 iter: 222 r: 0.1170571822E-03 b: 0.1172431558E+03
it:      21 iter: 224 r: 0.1231733135E-03 b: 0.1333832304E+03   it:      21 iter: 224 r: 0.1231733135E-03 b: 0.1333832304E+03
it:      22 iter: 220 r: 0.1426176447E-03 b: 0.1450395827E+03   it:      22 iter: 220 r: 0.1426176447E-03 b: 0.1450395827E+03
it:      23 iter: 228 r: 0.1513807915E-03 b: 0.1528616593E+03 | it:      23 iter: 228 r: 0.1513807916E-03 b: 0.1528616593E+03
it:      24 iter: 235 r: 0.1271929443E-03 b: 0.1369471086E+03 | it:      24 iter: 235 r: 0.1271929442E-03 b: 0.1369471086E+03
it:      25 iter: 211 r: 0.1521269235E-03 b: 0.1525207260E+03   it:      25 iter: 211 r: 0.1521269235E-03 b: 0.1525207260E+03
it:      26 iter: 219 r: 0.1362752240E-03 b: 0.1415425086E+03   it:      26 iter: 219 r: 0.1362752240E-03 b: 0.1415425086E+03
it:      27 iter: 224 r: 0.1251553617E-03 b: 0.1420996511E+03   it:      27 iter: 224 r: 0.1251553617E-03 b: 0.1420996511E+03
it:      28 iter: 236 r: 0.1260286974E-03 b: 0.1343858871E+03   it:      28 iter: 236 r: 0.1260286974E-03 b: 0.1343858871E+03
it:      29 iter: 241 r: 0.1008493923E-03 b: 0.1008782037E+03   it:      29 iter: 241 r: 0.1008493923E-03 b: 0.1008782037E+03
it:      30 iter: 223 r: 0.9955197568E-04 b: 0.1011429607E+03 | it:      30 iter: 223 r: 0.9955197565E-04 b: 0.1011429607E+03
it:      31 iter: 222 r: 0.9477631156E-04 b: 0.9985320917E+02   it:      31 iter: 222 r: 0.9477631156E-04 b: 0.9985320917E+02
it:      32 iter: 235 r: 0.9421596931E-04 b: 0.9848533904E+02   it:      32 iter: 235 r: 0.9421596931E-04 b: 0.9848533904E+02
it:      33 iter: 237 r: 0.9757431335E-04 b: 0.1040172271E+03 | it:      33 iter: 237 r: 0.9757431336E-04 b: 0.1040172271E+03
it:      34 iter: 227 r: 0.9434801556E-04 b: 0.9871033114E+02   it:      34 iter: 227 r: 0.9434801556E-04 b: 0.9871033114E+02
it:      35 iter: 237 r: 0.8551379803E-04 b: 0.9485651765E+02 | it:      35 iter: 237 r: 0.8551379799E-04 b: 0.9485651764E+02
it:      36 iter: 239 r: 0.9747039267E-04 b: 0.1023814358E+03 | it:      36 iter: 239 r: 0.9747039269E-04 b: 0.1023814358E+03
it:      37 iter: 227 r: 0.1013966654E-03 b: 0.1040925866E+03   it:      37 iter: 227 r: 0.1013966654E-03 b: 0.1040925866E+03
it:      38 iter: 234 r: 0.9590368812E-04 b: 0.1059139488E+03 | it:      38 iter: 234 r: 0.9590368810E-04 b: 0.1059139488E+03
it:      39 iter: 222 r: 0.9485436819E-04 b: 0.1027043343E+03 | it:      39 iter: 222 r: 0.9485436818E-04 b: 0.1027043343E+03
it:      40 iter: 240 r: 0.9143860768E-04 b: 0.9745946737E+02 | it:      40 iter: 240 r: 0.9143860767E-04 b: 0.9745946737E+02
it:      41 iter: 238 r: 0.8907978798E-04 b: 0.9395080442E+02 | it:      41 iter: 238 r: 0.8907978797E-04 b: 0.9395080441E+02
it:      42 iter: 239 r: 0.8339836163E-04 b: 0.8659721970E+02 | it:      42 iter: 239 r: 0.8339836163E-04 b: 0.8659721969E+02
it:      43 iter: 247 r: 0.7786796913E-04 b: 0.8426455983E+02 | it:      43 iter: 247 r: 0.7786796913E-04 b: 0.8426455982E+02
it:      44 iter: 235 r: 0.7186571072E-04 b: 0.7565130437E+02 | it:      44 iter: 235 r: 0.7186571071E-04 b: 0.7565130435E+02
it:      45 iter: 245 r: 0.6994205002E-04 b: 0.7343413837E+02 | it:      45 iter: 245 r: 0.6994205001E-04 b: 0.7343413837E+02
it:      46 iter: 238 r: 0.7182843161E-04 b: 0.7257049454E+02   it:      46 iter: 238 r: 0.7182843161E-04 b: 0.7257049454E+02
it:      47 iter: 245 r: 0.6690233671E-04 b: 0.6738372083E+02 | it:      47 iter: 245 r: 0.6690233670E-04 b: 0.6738372083E+02
it:      48 iter: 239 r: 0.6844159739E-04 b: 0.7067459861E+02 | it:      48 iter: 239 r: 0.6844159738E-04 b: 0.7067459863E+02
it:      49 iter: 232 r: 0.6107994914E-04 b: 0.6392276100E+02 | it:      49 iter: 232 r: 0.6107994913E-04 b: 0.6392276103E+02
it:      50 iter: 241 r: 0.6640447845E-04 b: 0.6727137368E+02 | it:      50 iter: 241 r: 0.6640447854E-04 b: 0.6727137369E+02
it:      51 iter: 240 r: 0.6991403245E-04 b: 0.7161535700E+02 | it:      51 iter: 240 r: 0.6991403242E-04 b: 0.7161535699E+02
it:      52 iter: 236 r: 0.6781219393E-04 b: 0.7212420553E+02 | it:      52 iter: 236 r: 0.6781219385E-04 b: 0.7212420550E+02
it:      53 iter: 240 r: 0.7646135785E-04 b: 0.7683167102E+02 | it:      53 iter: 240 r: 0.7646135809E-04 b: 0.7683167119E+02
it:      54 iter: 232 r: 0.7394635780E-04 b: 0.7825269209E+02 | it:      54 iter: 232 r: 0.7394635827E-04 b: 0.7825269212E+02
it:      55 iter: 235 r: 0.7643604264E-04 b: 0.7968694390E+02 | it:      55 iter: 235 r: 0.7643604368E-04 b: 0.7968694385E+02
it:      56 iter: 241 r: 0.8264647612E-04 b: 0.8284656150E+02 | it:      56 iter: 241 r: 0.8264647556E-04 b: 0.8284656153E+02
it:      57 iter: 222 r: 0.7886318773E-04 b: 0.7915755384E+02 | it:      57 iter: 222 r: 0.7886318735E-04 b: 0.7915755415E+02
it:      58 iter: 238 r: 0.7657788625E-04 b: 0.7975954897E+02 | it:      58 iter: 238 r: 0.7657788705E-04 b: 0.7975954902E+02
it:      59 iter: 237 r: 0.7483684528E-04 b: 0.7830374794E+02 | it:      59 iter: 237 r: 0.7483684578E-04 b: 0.7830374829E+02
it:      60 iter: 237 r: 0.6991776364E-04 b: 0.7485478537E+02 | it:      60 iter: 237 r: 0.6991776397E-04 b: 0.7485478553E+02
it:      61 iter: 237 r: 0.7716199999E-04 b: 0.7964523264E+02 | it:      61 iter: 237 r: 0.7716200059E-04 b: 0.7964523252E+02
it:      62 iter: 222 r: 0.8292296086E-04 b: 0.8305721895E+02 | it:      62 iter: 222 r: 0.8292296396E-04 b: 0.8305721881E+02
it:      63 iter: 245 r: 0.6741879094E-04 b: 0.6973088407E+02 | it:      63 iter: 245 r: 0.6741879162E-04 b: 0.6973088380E+02
it:      64 iter: 236 r: 0.7970669631E-04 b: 0.8153350486E+02 | it:      64 iter: 236 r: 0.7970669534E-04 b: 0.8153350311E+02
it:      65 iter: 239 r: 0.6540295982E-04 b: 0.6608225667E+02 | it:      65 iter: 239 r: 0.6540295873E-04 b: 0.6608225721E+02
it:      66 iter: 239 r: 0.7337301635E-04 b: 0.7462617329E+02 | it:      66 iter: 239 r: 0.7337301525E-04 b: 0.7462617396E+02
it:      67 iter: 224 r: 0.5952732133E-04 b: 0.6170857168E+02 | it:      67 iter: 224 r: 0.5952732382E-04 b: 0.6170857364E+02
it:      68 iter: 243 r: 0.6669748782E-04 b: 0.6900407637E+02 | it:      68 iter: 243 r: 0.6669748866E-04 b: 0.6900407556E+02
it:      69 iter: 239 r: 0.5561929173E-04 b: 0.5866236948E+02 | it:      69 iter: 239 r: 0.5561929589E-04 b: 0.5866236455E+02
it:      70 iter: 237 r: 0.6183352311E-04 b: 0.6451672024E+02 | it:      70 iter: 237 r: 0.6183352293E-04 b: 0.6451671829E+02
it:      71 iter: 244 r: 0.5251528072E-04 b: 0.5517850326E+02 | it:      71 iter: 244 r: 0.5251528094E-04 b: 0.5517849774E+02
it:      72 iter: 226 r: 0.5913271173E-04 b: 0.6313400882E+02 | it:      72 iter: 226 r: 0.5913271920E-04 b: 0.6313400976E+02
it:      73 iter: 232 r: 0.5385346836E-04 b: 0.5446251474E+02 | it:      73 iter: 232 r: 0.5385343939E-04 b: 0.5446249082E+02
it:      74 iter: 238 r: 0.5387644560E-04 b: 0.5676716485E+02 | it:      74 iter: 238 r: 0.5387646028E-04 b: 0.5676714414E+02
it:      75 iter: 227 r: 0.5215692929E-04 b: 0.5241224322E+02 | it:      75 iter: 227 r: 0.5215693726E-04 b: 0.5241225638E+02
Last modified 9 years ago Last modified on 2011-11-11T14:05:50+01:00