Changeset 3983 for trunk/NEMOGCM/NEMO

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/NEMO/OPA_SRC

Files:

• ICB/icb_oce.F90 (modified) (2 diffs)
• ICB/icbini.F90 (modified) (1 diff)
• ICB/icbstp.F90 (modified) (1 diff)
• IOM/iom.F90 (modified) (3 diffs)

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

@@ -37 +37 @@
    USE par_oce   ! ocean parameters
    USE lib_mpp   ! MPP library
-   USE fldread   ! read input fields (FLD type)
 
    IMPLICIT NONE
@@ -151 +150 @@
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:,:)   :: griddata                           !: work array for icbrst
 
-   TYPE(FLD), PUBLIC, ALLOCATABLE     , DIMENSION(:)       ::   sf_icb   !: structure: file information, fields read
-
    !!----------------------------------------------------------------------
    !! NEMO/OPA 3.3 , NEMO Consortium (2011)

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

@@ -35 +35 @@
    PUBLIC   icb_init  ! routine called in nemogcm.F90 module
 
-   CHARACTER(len=100) ::   cn_dir = './'   ! Root directory for location of icb files
-   TYPE(FLD_N)        ::   sn_icb          ! information about the calving file to be read
+   CHARACTER(len=100)                                 ::   cn_dir = './'   !: Root directory for location of icb files
+   TYPE(FLD_N)                                        ::   sn_icb          !: information about the calving file to be read
+   TYPE(FLD), PUBLIC, ALLOCATABLE     , DIMENSION(:)  ::   sf_icb          !: structure: file information, fields read
+                                                                           !: used in icbini and icbstp
 
    !!----------------------------------------------------------------------

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

@@ -24 +24 @@
    USE lib_mpp
    USE iom
+   USE fldread
    USE timing         ! timing
 

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

@@ -31 +31 @@
    USE sbc_oce, ONLY :   nn_fsbc         ! ocean space and time domain
    USE trc_oce, ONLY :   nn_dttrc        !  !: frequency of step on passive tracers
+   USE icb_oce, ONLY :   class_num       !  !: iceberg classes
    USE domngb          ! ocean space and time domain
    USE phycst          ! physical constants
@@ -99 +100 @@
       clname = "nemo"
       IF( TRIM(Agrif_CFixed()) /= '0' )   clname = TRIM(Agrif_CFixed())//"_"//TRIM(clname)
-#if defined key_mpp_mpi
+# if defined key_mpp_mpi
       CALL xios_context_initialize(TRIM(clname), mpi_comm_opa)
-#else
+# else
       CALL xios_context_initialize(TRIM(clname), 0)
-#endif
+# endif
       CALL iom_swap
 
@@ -128 +129 @@
       CALL iom_set_axis_attr( "depthw", gdepw_0 )
 # if defined key_floats
-      CALL iom_set_axis_attr( "nfloat", (ji, ji=1,nfloat) )
+      CALL iom_set_axis_attr( "nfloat", (/ (REAL(ji,wp), ji=1,nfloat) /) )
 # endif
+      CALL iom_set_axis_attr( "icbcla", class_num )
       
       ! automatic definitions of some of the xml attributs