Changeset 2674 for branches

Timestamp:

2011-03-08T18:30:16+01:00 (13 years ago)

Author:

rblod

Message:

First set of changes in OPA_SRC to ensure AGRIF compatibility

Location:

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC

Files:

• DYN/dynspg.F90 (modified) (2 diffs)
• DYN/dynspg_flt.F90 (modified) (2 diffs)
• SBC/sbcapr.F90 (modified) (1 diff)
• SBC/sbcblk_clio.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (3 diffs)
• par_oce.F90 (modified) (2 diffs)
• wrk_nemo.F90 (modified) (1 diff)

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg.F90

@@ -28 +28 @@
    USE in_out_manager ! I/O manager
    USE lib_mpp        ! MPP library
+   USE solver          ! solver initialization
 
    IMPLICIT NONE
@@ -204 +205 @@
       ENDIF
 
+      IF( nspg == 2 .OR. nspg == -1 ) CALL solver_init( nit000 )   ! Elliptic solver initialisation
+
       !                        ! Control of timestep choice
       IF( lk_dynspg_ts .OR. lk_dynspg_exp ) THEN

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN/dynspg_flt.F90

@@ -31 +31 @@
    USE dynadv          ! advection 
    USE solmat          ! matrix construction for elliptic solvers
-   USE solver          ! solver initialization
    USE solpcg          ! preconditionned conjugate gradient solver
    USE solsor          ! Successive Over-relaxation solver
@@ -124 +123 @@
          spgu(:,:) = 0.e0                     ! surface pressure gradient (i-direction)
          spgv(:,:) = 0.e0                     ! surface pressure gradient (j-direction)
-         CALL solver_init( nit000 )           ! Elliptic solver initialisation
 
          ! read filtered free surface arrays in restart file

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbcapr.F90

@@ -41 +41 @@
    REAL(wp) ::   r1_grau              ! = 1.e0 / (grav * rau0)
    
-   TYPE(FLD), ALLOCATABLE, SAVE, DIMENSION(:) ::   sf_apr   ! structure of input fields (file informations, fields read)
+   TYPE(FLD), ALLOCATABLE, DIMENSION(:) ::   sf_apr   ! structure of input fields (file informations, fields read)
 
    !! * Substitutions

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk_clio.F90

@@ -52 +52 @@
    INTEGER , PARAMETER ::   jp_tair = 6           ! index of 10m air temperature             (Kelvin)
    INTEGER , PARAMETER ::   jp_prec = 7           ! index of total precipitation (rain+snow) (Kg/m2/s)
-   TYPE(FLD),ALLOCATABLE,SAVE,DIMENSION(:) :: sf  ! structure of input fields (file informations, fields read)
+   TYPE(FLD),ALLOCATABLE,DIMENSION(:) :: sf  ! structure of input fields (file informations, fields read)
 
    INTEGER, PARAMETER  ::   jpintsr = 24          ! number of time step between sunrise and sunset

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -113 +113 @@
       CALL nemo_init               !==  Initialisations  ==!
       !                            !-----------------------!
-
+#if defined key_agrif
+      CALL Agrif_Declare_Variables()      ! AGRIF: set the meshes
+#endif
       ! check that all process are still there... If some process have an error,
       ! they will never enter in step and other processes will wait until the end of the cpu time!
@@ -226 +228 @@
       ! then we calculate them here now that we have our communicator size
       IF( (jpni < 1) .OR. (jpnj < 1) )THEN
-#if   defined key_mpp_mpi   ||   defined key_mpp_shmem
-         CALL nemo_partition(mppsize)
+#if   defined key_mpp_mpi
+         IF( Agrif_Root() ) CALL nemo_partition(mppsize)
 #else
          jpni = 1
@@ -238 +240 @@
       ! This used to be done in par_oce.F90 when they were parameters rather
       ! than variables
-      jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci !: first  dim.
-      jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj !: second dim.
-      jpk = jpkdta                                           !: third dim
-      jpim1 = jpi-1                                          !: inner domain indices
-      jpjm1 = jpj-1                                          !:   "           "
-      jpkm1 = jpk-1                                          !:   "           "
-      jpij  = jpi*jpj                                        !:  jpi x j
+      IF( Agrif_Root() ) THEN
+         jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci !: first  dim.
+         jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj !: second dim.
+         jpk = jpkdta                                           !: third dim
+         jpim1 = jpi-1                                          !: inner domain indices
+         jpjm1 = jpj-1                                          !:   "           "
+         jpkm1 = jpk-1                                          !:   "           "
+         jpij  = jpi*jpj                                        !:  jpi x j
+      ENDIF
 
       IF(lwp) THEN                            ! open listing units

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/par_oce.F90

@@ -17 +17 @@
    !!----------------------------------------------------------------------
    !! if we dont use massively parallel computer (parameters jpni=jpnj=1) so jpiglo=jpi and jpjglo=jpj
-!!$#if ! defined key_mpp_dyndist 
-!!$   INTEGER, PUBLIC, PARAMETER ::    &  !:
-!!$# if ! defined key_nproci
-!!$      jpni   = 1,                   &  !: number of processors following i
-!!$      jpnj   = 1,                   &  !: number of processors following j
-!!$      jpnij  = 1                       !: nb of local domain = nb of processors 
-!!$      !                                !  ( <= jpni x jpnj )
-!!$# else
-!!$      jpni   = key_nproci,          &  !: number of processors following i
-!!$      jpnj   = key_nprocj,          &  !: number of processors following j
-!!$#  if ! defined key_nprocij
-!!$      jpnij  = key_nproci * key_nprocj !: nb of local domain = nb of processors 
-!!$      !                                !  ( <= jpni x jpnj )
-!!$#  else
-!!$      jpnij  = key_nprocij             !: nb of local domain = nb of processors 
-!!$      !                                !  ( <= jpni x jpnj )
-!!$#  endif
-!!$# endif
-!!$#else
    INTEGER, PUBLIC            ::   jpni         !: number of processors following i 
    INTEGER, PUBLIC            ::   jpnj         !: number of processors following j
    INTEGER, PUBLIC            ::   jpnij        !: nb of local domain = nb of processors ( <= jpni x jpnj )
-!!$#endif
    INTEGER, PUBLIC, PARAMETER ::   jpr2di = 0   !: number of columns for extra outer halo 
    INTEGER, PUBLIC, PARAMETER ::   jpr2dj = 0   !: number of rows    for extra outer halo 
@@ -188 +168 @@
    INTEGER, PUBLIC            ::   nbcellsy     = jpjglo - 2 - 2*nbghostcells   !: number of cells in j-direction
    !
-   INTEGER, PUBLIC            ::   jpi = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension
-   INTEGER, PUBLIC            ::   jpj = ( jpjglo-2*jprecj + (jpnj-1) ) / jpnj + 2*jprecj   !: second dimension
-   INTEGER, PUBLIC            ::   jpim1 = jpi-1                                            !: inner domain indices
-   INTEGER, PUBLIC            ::   jpjm1 = jpj-1                                            !:   -     -      -
-   INTEGER, PUBLIC            ::   jpkm1 = jpk-1                                            !:   -     -      -
-   INTEGER, PUBLIC            ::   jpij  = jpi*jpj                                          !:  jpi x jpj
 #else
    INTEGER, PUBLIC  ::   jpi   ! = ( jpiglo-2*jpreci + (jpni-1) ) / jpni + 2*jpreci   !: first  dimension

branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

@@ -44 +44 @@
    ! Maximum no. of workspaces of any one dimensionality that can be
    ! requested - MAX(num_1d_wrkspaces, num_2d_wrkspaces, num_3d_wrkspaces, num_4d_wrkspaces) 
-   INTEGER, PARAMETER :: max_num_wrkspaces = 35
+   INTEGER :: max_num_wrkspaces = 35
 
    ! If adding more arrays here, remember to increment the appropriate