Changeset 2674 for branches/dev_r2586_dynamic_mem/NEMOGCM/NEMO/OPA_SRC/DYN

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/DYN

Files:

• dynspg.F90 (modified) (2 diffs)
• dynspg_flt.F90 (modified) (2 diffs)

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