Changeset 9069 for branches/2017/dev_merge_2017/NEMOGCM/NEMO

Timestamp:

2017-12-15T10:35:02+01:00 (6 years ago)

Author:

acc

Message:

Branch 2017/dev_merge_2017. mpp minor changes to reinstate missing jperio=7 option.

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC

Files:

• lib_mpp.F90 (modified) (1 diff)
• mppini.F90 (modified) (2 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -136 +136 @@
 
    ! variables used in case of sea-ice
-   INTEGER, PUBLIC ::   ncomm_ice       !: communicator made by the processors with sea-ice (public so that it can be freed in limthd)
+   INTEGER, PUBLIC ::   ncomm_ice       !: communicator made by the processors with sea-ice (public so that it can be freed in icethd)
    INTEGER         ::   ngrp_iworld     !  group ID for the world processors (for rheology)
    INTEGER         ::   ngrp_ice        !  group ID for the ice processors (for rheology)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/LBC/mppini.F90

@@ -251 +251 @@
          ! warning ii*ij (zone) /= nproc (processors)!
 
-         IF( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 ) THEN
+         IF( jperio == 1 .OR. jperio == 4 .OR. jperio == 6 .OR. jperio == 7 ) THEN
             IF( jpni == 1 )THEN
                ibondi(ii,ij) = 2
@@ -494 +494 @@
          WRITE(numout,*) ' nn_hls = ', nn_hls 
       ENDIF
-
+ 
       IF( nperio == 1 .AND. jpni /= 1 ) CALL ctl_stop( 'mpp_init: error on cyclicity' )
+
+      IF( jperio == 7 .AND. ( jpni /= 1 .OR. jpnj /= 1 ) ) &
+         &                  CALL ctl_stop( ' mpp_init: error jperio = 7 works only with jpni = jpnj = 1' )
 
       !                          ! Prepare mpp north fold