New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
ticket/1006_dev_NOC_2012_rev3555 (diff) – NEMO

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


Ignore:
Timestamp:
2012-11-20T16:21:48+01:00 (12 years ago)
Author:
acc
Comment:

--

Legend:

Unmodified
Added
Removed
Modified
  • ticket/1006_dev_NOC_2012_rev3555

    v1 v2  
    88 
    99{{{ 
    10 2012/dev_r3322_NOCS09_SAS               [added to merge at changeset      ] 
    11 2012/dev_r3337_NOCS10_ICB               [added to merge at changeset      ] 
     102012/dev_r3322_NOCS09_SAS               [added to merge at changeset  3607    ] 
     112012/dev_r3337_NOCS10_ICB               [added to merge at changeset  3609    ] 
    12122012/dev_r3385_NOCS04_HAMF              [added to merge at changeset      ] 
    1313 
     
    382382Committed revision 3610. 
    383383}}} 
     384 
     385'''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: 
     386 
     387  
     388{{{ 
     389      CALL iom_put( "berg_melt"        , berg_melt   (:,:)   )   ! Melt rate of icebergs                     [kg/m2/s] 
     390      CALL iom_put( "berg_buoy_melt"   , buoy_melt   (:,:)   )   ! Buoyancy component of iceberg melt rate   [kg/m2/s] 
     391      CALL iom_put( "berg_eros_melt"   , eros_melt   (:,:)   )   ! Erosion component of iceberg melt rate    [kg/m2/s] 
     392      CALL iom_put( "berg_conv_melt"   , conv_melt   (:,:)   )   ! Convective component of iceberg melt rate [kg/m2/s] 
     393      CALL iom_put( "berg_virtual_area", virtual_area(:,:)   )   ! Virtual coverage by icebergs              [m2] 
     394      CALL iom_put( "bits_src"         , bits_src    (:,:)   )   ! Mass source of bergy bits                 [kg/m2/s] 
     395      CALL iom_put( "bits_melt"        , bits_melt   (:,:)   )   ! Melt rate of bergy bits                   [kg/m2/s] 
     396      CALL iom_put( "bits_mass"        , bits_mass   (:,:)   )   ! Bergy bit density field                   [kg/m2] 
     397      CALL iom_put( "berg_mass"        , berg_mass   (:,:)   )   ! Iceberg density field                     [kg/m2] 
     398      CALL iom_put( "berg_real_calving", real_calving(:,:,:) )   ! Calving into iceberg class                [kg/s] 
     399}}} 
     400 
     401but 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: 
     402 
     403{{{ 
     404GYRELOB     restartability  passed 
     405ORCA2LIMPIS restartability  passed 
     406ORCA2OFFPIS restartability  passed 
     407AMM12       restartability  FAILED 
     408 
     409GYRELOB     reproducibility passed 
     410ORCA2LIMPIS reproducibility passed 
     411ORCA2OFFPIS reproducibility passed 
     412AMM12       reproducibility FAILED 
     413 
     414After which the successful code has been checked in: 
     415 
     416svn ci -m"Branch dev_NOC_2012_r3555. #1006. Step 6: Minor code changes and updated namelists to enable successful SETTE testing" 
     417 
     418Sending        NEMOGCM/CONFIG/GYRE/EXP00/namelist 
     419Sending        NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/namelist 
     420Sending        NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/namelist 
     421Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90 
     422Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbclv.F90 
     423Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdia.F90 
     424Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbdyn.F90 
     425Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90 
     426Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icblbc.F90 
     427Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbrst.F90 
     428Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90 
     429Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbthm.F90 
     430Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbtrj.F90 
     431Sending        NEMOGCM/NEMO/OPA_SRC/ICB/icbutl.F90 
     432Sending        NEMOGCM/NEMO/OPA_SRC/SBC/sbcssm.F90 
     433Transmitting file data ............... 
     434Committed revision 3614. 
     435}}} 
     436 
     437 
     438