Changeset 6736 for branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/SOL

Timestamp:

2016-06-24T09:50:27+02:00 (8 years ago)

Author:

jamesharle

Message:

FASTNEt code modifications

Location:

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/SOL

Files:

• solmat.F90 (modified) (1 diff)
• solsor.F90 (modified) (3 diffs)

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/SOL/solmat.F90

@@ -284 +284 @@
 
       IF( nn_solv == 2 .AND. MAX( jpr2di, jpr2dj ) > 0) THEN
-         CALL lbc_lnk_e( gcp   (:,:,1), c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
-         CALL lbc_lnk_e( gcp   (:,:,2), c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
-         CALL lbc_lnk_e( gcp   (:,:,3), c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
-         CALL lbc_lnk_e( gcp   (:,:,4), c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
-         CALL lbc_lnk_e( gcdprc(:,:)  , c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
-         CALL lbc_lnk_e( gcdmat(:,:)  , c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions         
+         CALL lbc_lnk_e( gcp   (:,:,1), c_solver_pt, 1. )   ! lateral boundary conditions
+         CALL lbc_lnk_e( gcp   (:,:,2), c_solver_pt, 1. )   ! lateral boundary conditions
+         CALL lbc_lnk_e( gcp   (:,:,3), c_solver_pt, 1. )   ! lateral boundary conditions
+         CALL lbc_lnk_e( gcp   (:,:,4), c_solver_pt, 1. )   ! lateral boundary conditions
+         CALL lbc_lnk_e( gcdprc(:,:)  , c_solver_pt, 1. )   ! lateral boundary conditions
+         CALL lbc_lnk_e( gcdmat(:,:)  , c_solver_pt, 1. )   ! lateral boundary conditions         
          IF( npolj /= 0 ) CALL sol_exd( gcp , c_solver_pt ) ! switch northernelements
       END IF

branches/NERC/dev_r3874_FASTNEt/NEMOGCM/NEMO/OPA_SRC/SOL/solsor.F90

@@ -81 +81 @@
          !                                                    ! ==============
 
-         IF( MOD(icount,ijpr2d+1) == 0 )   CALL lbc_lnk_e( gcx, c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
+         IF( MOD(icount,ijpr2d+1) == 0 )   CALL lbc_lnk_e( gcx, c_solver_pt, 1. )   ! lateral boundary conditions
         
          ! Residus
@@ -104 +104 @@
          icount = icount + 1 
  
-         IF( MOD(icount,ijpr2d+1) == 0 )   CALL lbc_lnk_e( gcx, c_solver_pt, 1., jpr2di, jpr2dj )   ! lateral boundary conditions
+         IF( MOD(icount,ijpr2d+1) == 0 )   CALL lbc_lnk_e( gcx, c_solver_pt, 1. )   ! lateral boundary conditions
 
          ! Guess red update
@@ -167 +167 @@
       !  Output in gcx
       !  -------------
-      CALL lbc_lnk_e( gcx, c_solver_pt, 1._wp, jpr2di, jpr2dj )    ! boundary conditions
+      CALL lbc_lnk_e( gcx, c_solver_pt, 1. )    ! boundary conditions
       !
       CALL wrk_dealloc( jpi, jpj, ztab )