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.
Changeset 3983 – NEMO

Changeset 3983


Ignore:
Timestamp:
2013-07-19T18:22:47+02:00 (11 years ago)
Author:
acc
Message:

Update xml files with missing iceberg (ICB) variables and add new axis definition to iom.F90. The latter requires changes in icb modules to avoid a cyclic dependency

Location:
trunk/NEMOGCM
Files:
17 edited

Legend:

Unmodified
Added
Removed

  • trunk/NEMOGCM/CONFIG/AMM12/EXP00/iodef.xml

    r3940 r3983  
    6262      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    6363      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     64      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    6465   </axis_definition>  
    6566     

  • trunk/NEMOGCM/CONFIG/GYRE/EXP00/iodef.xml

    r3940 r3983  
    9292      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    9393      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     94      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    9495   </axis_definition>  
    9596     

  • trunk/NEMOGCM/CONFIG/GYRE_BFM/EXP00/iodef.xml

    r3940 r3983  
    6262      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    6363      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     64      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    6465   </axis_definition>  
    6566     

  • trunk/NEMOGCM/CONFIG/GYRE_PISCES/EXP00/iodef.xml

    r3940 r3983  
    128128      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    129129      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     130      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    130131   </axis_definition>  
    131132     

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_ar5.xml

    r3940 r3983  
    248248      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    249249      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     250      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    250251   </axis_definition>  
    251252     

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_default.xml

    r3966 r3983  
    129129      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    130130      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     131      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    131132   </axis_definition>  
    132133     

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_demo.xml

    r3966 r3983  
    8686      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    8787      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     88      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    8889   </axis_definition>  
    8990     

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM/EXP00/iodef_oldstyle.xml

    r3966 r3983  
    116116      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    117117      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     118      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    118119   </axis_definition>  
    119120     

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM_CFC_C14b/EXP00/iodef.xml

    r3771 r3983  
    6060      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    6161      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     62      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    6263   </axis_definition>  
    6364     

  • trunk/NEMOGCM/CONFIG/ORCA2_LIM_PISCES/EXP00/iodef.xml

    r3905 r3983  
    230230      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    231231      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     232      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    232233   </axis_definition>  
    233234     

  • trunk/NEMOGCM/CONFIG/ORCA2_OFF_PISCES/EXP00/iodef.xml

    r3771 r3983  
    157157      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    158158      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     159      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    159160   </axis_definition>  
    160161     

  • trunk/NEMOGCM/CONFIG/ORCA2_SAS_LIM/EXP00/iodef.xml

    r3771 r3983  
    6060      <axis id="depthw" long_name="Vertical W levels" unit="m" positive="down" /> 
    6161      <axis id="nfloat" long_name="Float number"      unit="-"  /> 
     62      <axis id="icbcla" long_name="Iceberg class"     unit="-"  /> 
    6263   </axis_definition>  
    6364     

  • trunk/NEMOGCM/CONFIG/SHARED/field_def.xml

    r3975 r3983  
    219219        <field id="traj_dens"  long_name="floats density"     unit="kg/m3" /> 
    220220        <field id="traj_group" long_name="floats group"       unit="none"  /> 
     221      </field_group> 
     222 
     223      <!-- variables available with iceberg trajectories --> 
     224      <field_group id="icbvar" domain_ref="grid_T"  >  
     225        <field id="berg_melt"          long_name="icb melt rate of icebergs"                     unit="kg/m2/s"   /> 
     226        <field id="berg_buoy_melt"     long_name="icb buoyancy component of iceberg melt rate"   unit="kg/m2/s"   /> 
     227        <field id="berg_eros_melt"     long_name="icb erosion component of iceberg melt rate"    unit="kg/m2/s"   /> 
     228        <field id="berg_conv_melt"     long_name="icb convective component of iceberg melt rate" unit="kg/m2/s"   /> 
     229        <field id="berg_virtual_area"  long_name="icb virtual coverage by icebergs"              unit="m2"        /> 
     230        <field id="bits_src"           long_name="icb mass source of bergy bits"                 unit="kg/m2/s"   /> 
     231        <field id="bits_melt"          long_name="icb melt rate of bergy bits"                   unit="kg/m2/s"   /> 
     232        <field id="bits_mass"          long_name="icb bergy bit density field"                   unit="kg/m2"     /> 
     233        <field id="berg_mass"          long_name="icb iceberg density field"                     unit="kg/m2"     /> 
     234        <field id="calving"            long_name="icb calving mass input"                        unit="kg/s"      /> 
     235        <field id="berg_floating_melt" long_name="icb melt rate of icebergs + bits"              unit="kg/m2/s"   /> 
     236        <field id="berg_real_calving"  long_name="icb calving into iceberg class"                unit="kg/s"     axis_ref="icbcla" /> 
     237        <field id="berg_stored_ice"    long_name="icb accumulated ice mass by class"             unit="kg"       axis_ref="icbcla" /> 
    221238      </field_group> 
    222239 

  • trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icb_oce.F90

    r3614 r3983  
    3737   USE par_oce   ! ocean parameters 
    3838   USE lib_mpp   ! MPP library 
    39    USE fldread   ! read input fields (FLD type) 
    4039 
    4140   IMPLICIT NONE 
    … …  
    151150   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)   :: griddata                           !: work array for icbrst 
    152151 
    153    TYPE(FLD), PUBLIC, ALLOCATABLE     , DIMENSION(:)       ::   sf_icb   !: structure: file information, fields read 
    154  
    155152   !!---------------------------------------------------------------------- 
    156153   !! NEMO/OPA 3.3 , NEMO Consortium (2011) 

  • trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbini.F90

    r3785 r3983  
    3535   PUBLIC   icb_init  ! routine called in nemogcm.F90 module 
    3636 
    37    CHARACTER(len=100) ::   cn_dir = './'   ! Root directory for location of icb files 
    38    TYPE(FLD_N)        ::   sn_icb          ! information about the calving file to be read 
     37   CHARACTER(len=100)                                 ::   cn_dir = './'   !: Root directory for location of icb files 
     38   TYPE(FLD_N)                                        ::   sn_icb          !: information about the calving file to be read 
     39   TYPE(FLD), PUBLIC, ALLOCATABLE     , DIMENSION(:)  ::   sf_icb          !: structure: file information, fields read 
     40                                                                           !: used in icbini and icbstp 
    3941 
    4042   !!---------------------------------------------------------------------- 

  • trunk/NEMOGCM/NEMO/OPA_SRC/ICB/icbstp.F90

    r3614 r3983  
    2424   USE lib_mpp 
    2525   USE iom 
     26   USE fldread 
    2627   USE timing         ! timing 
    2728 

  • trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r3971 r3983  
    3131   USE sbc_oce, ONLY :   nn_fsbc         ! ocean space and time domain 
    3232   USE trc_oce, ONLY :   nn_dttrc        !  !: frequency of step on passive tracers 
     33   USE icb_oce, ONLY :   class_num       !  !: iceberg classes 
    3334   USE domngb          ! ocean space and time domain 
    3435   USE phycst          ! physical constants 
    … …  
    99100      clname = "nemo" 
    100101      IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname) 
    101 #if defined key_mpp_mpi 
     102# if defined key_mpp_mpi 
    102103      CALL xios_context_initialize(TRIM(clname), mpi_comm_opa) 
    103 #else 
     104# else 
    104105      CALL xios_context_initialize(TRIM(clname), 0) 
    105 #endif 
     106# endif 
    106107      CALL iom_swap 
    107108 
    … …  
    128129      CALL iom_set_axis_attr( "depthw", gdepw_0 ) 
    129130# if defined key_floats 
    130       CALL iom_set_axis_attr( "nfloat", (ji, ji=1,nfloat) ) 
     131      CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,nfloat) /) ) 
    131132# endif 
     133      CALL iom_set_axis_attr( "icbcla", class_num ) 
    132134       
    133135      ! automatic definitions of some of the xml attributs 
Note: See TracChangeset for help on using the changeset viewer.