Changes between Version 3 and Version 4 of ticket/1006_dev_NOC_2012_rev3555


Ignore:
Timestamp:
2012-11-22T15:31:31+01:00 (8 years ago)
Author:
acc
Comment:

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1006_dev_NOC_2012_rev3555

    v3 v4  
    10102012/dev_r3322_NOCS09_SAS               [added to merge at changeset  3607    ] 
    11112012/dev_r3337_NOCS10_ICB               [added to merge at changeset  3609    ] 
    12 2012/dev_r3385_NOCS04_HAMF              [added to merge at changeset      ] 
     122012/dev_r3385_NOCS04_HAMF              [added to merge at changeset 3631     ] 
    1313 
    14142012/dev_r3452_NOCL02_Smagorinsky       [added to merge at changeset      ] 
     
    435435}}} 
    436436 
    437 '''Stage 7'''. Merge in changes from the dev_r3385_NOCS04_HAMF branch and resolve conflicts. 
     437'''Step 7'''. Merge in changes from the dev_r3385_NOCS04_HAMF branch and resolve conflicts. 
    438438 
    439439{{{ 
     
    673673}}} 
    674674 
    675  
     675'''Step 8'''. SETTE testing of merge to date. Correct minor bug in icbthm.F90 (remove reference to emps array). General tidying and updating of iodef.xml files. Tests initially failed because SETTE/iodef_sette.xml did not have the new field definitions (also missing correct DSi/DGi definition for PISCES?). Check in code after successful testing 
     676 
     677{{{ 
     678GYRELOB     restartability  passed 
     679ORCA2LIMPIS restartability  passed 
     680ORCA2OFFPIS restartability  passed 
     681AMM12       restartability  FAILED 
     682 
     683GYRELOB     reproducibility passed 
     684ORCA2LIMPIS reproducibility passed 
     685ORCA2OFFPIS reproducibility passed 
     686AMM12       reproducibility FAILED 
     687 
     688 
     689svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 8. Minor code changes and updated iodef.xml files to enable successful SETTE testing" 
     690 
     691Sending        NEMOGCM/ARCH/NOC/arch-ALTIX_NAUTILUS_MPT.fcm 
     692Sending        NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml 
     693Sending        NEMOGCM/CONFIG/AMM12_PISCES/EXP00/iodef.xml 
     694Sending        NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml 
     695Sending        NEMOGCM/CONFIG/GYRE_LOBSTER/EXP00/iodef.xml 
     696Sending        NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef.xml 
     697Sending        NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml 
     698Sending        NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml 
     699Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 
     700Sending        NEMOGCM/SETTE/BATCH_TEMPLATE/batch-ALTIX_NAUTILUS_MPT 
     701Sending        NEMOGCM/SETTE/iodef_sette.xml 
     702Transmitting file data ........... 
     703Committed revision 3631. 
     704}}} 
     705 
     706This completes the NOCS merge.