Changes between Version 1 and Version 2 of ticket/1006_dev_NOC_2012_rev3555

Timestamp:

2012-11-20T16:21:48+01:00 (11 years ago)

Author:

acc

Comment:

--

ticket/1006_dev_NOC_2012_rev3555

@@ -8 +8 @@
 
 {{{
-2012/dev_r3322_NOCS09_SAS               [added to merge at changeset      ]
-2012/dev_r3337_NOCS10_ICB               [added to merge at changeset      ]
+2012/dev_r3322_NOCS09_SAS               [added to merge at changeset  3607    ]
+2012/dev_r3337_NOCS10_ICB               [added to merge at changeset  3609    ]
 2012/dev_r3385_NOCS04_HAMF              [added to merge at changeset      ]
 
@@ -382 +382 @@
 Committed revision 3610.
 }}}
+
+'''Step 6.''' Check SETTE status before merging with the more intrusive HAMF branch. Some changes required to achieve successful compilation of all SETTE tests (except the AGRIF test which has never successfully compiled on nautilus). Minor bugs found in sbcssm.F90 and icb_oce.F90. New namberg namelist missing from GYRE, ORCA2_OFF_PISCES and ORCA2_SAS_LIM experiment directories. Stripped ICB modules of their dos-style line endings (CRLF). Also needed to update iodef.xml files to a more recent version in order to run those tests using key_iomput. This latter problem must be a trunk error which has been fixed later so the updated iodef.xml files have not been checked in on this branch. Note, the iceberg code has new iom_put statements in NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90 which do not have corresponding entries in the iodef.xml files. These entries will have to be matched at some point:
+
+ 
+{{{
+      CALL iom_put( "berg_melt"        , berg_melt   (:,:)   )   ! Melt rate of icebergs                     [kg/m2/s]
+      CALL iom_put( "berg_buoy_melt"   , buoy_melt   (:,:)   )   ! Buoyancy component of iceberg melt rate   [kg/m2/s]
+      CALL iom_put( "berg_eros_melt"   , eros_melt   (:,:)   )   ! Erosion component of iceberg melt rate    [kg/m2/s]
+      CALL iom_put( "berg_conv_melt"   , conv_melt   (:,:)   )   ! Convective component of iceberg melt rate [kg/m2/s]
+      CALL iom_put( "berg_virtual_area", virtual_area(:,:)   )   ! Virtual coverage by icebergs              [m2]
+      CALL iom_put( "bits_src"         , bits_src    (:,:)   )   ! Mass source of bergy bits                 [kg/m2/s]
+      CALL iom_put( "bits_melt"        , bits_melt   (:,:)   )   ! Melt rate of bergy bits                   [kg/m2/s]
+      CALL iom_put( "bits_mass"        , bits_mass   (:,:)   )   ! Bergy bit density field                   [kg/m2]
+      CALL iom_put( "berg_mass"        , berg_mass   (:,:)   )   ! Iceberg density field                     [kg/m2]
+      CALL iom_put( "berg_real_calving", real_calving(:,:,:) )   ! Calving into iceberg class                [kg/s]
+}}}
+
+but this may as well be done after the merge since the XIOS branch introduces new xml files. With these changes the following SETTE status is achieved:
+
+{{{
+GYRELOB     restartability  passed
+ORCA2LIMPIS restartability  passed
+ORCA2OFFPIS restartability  passed
+AMM12       restartability  FAILED
+
+GYRELOB     reproducibility passed
+ORCA2LIMPIS reproducibility passed
+ORCA2OFFPIS reproducibility passed
+AMM12       reproducibility FAILED
+
+After which the successful code has been checked in:
+
+svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 6: Minor code changes and updated namelists to enable successful SETTE testing"
+
+Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist
+Sending        NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90
+Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90
+Transmitting file data ...............
+Committed revision 3614.
+}}}
+
+
+