Changeset 14976 for NEMO/trunk/src/OCE/LBC

Timestamp:

2021-06-11T11:14:27+02:00 (3 years ago)

Author:

jchanut

Message:

#2638, merge dev_14608_AGRIF_domcfg branch into trunk

Location:

NEMO/trunk

Files:

• . (modified) (1 prop)
• src/OCE/LBC/mppini.F90 (modified) (2 diffs)

NEMO/trunk

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL

NEMO/trunk/src/OCE/LBC/mppini.F90

@@ -89 +89 @@
       !
 #if defined key_agrif
-    IF (.NOT.agrif_root()) THEN
       call agrif_nemo_init()
-    ENDIF
 #endif
    END SUBROUTINE mpp_init
@@ -307 +305 @@
 
 #if defined key_agrif
-      IF( .NOT. Agrif_Root() ) THEN       ! AGRIF children: specific setting (cf. agrif_user.F90)
          CALL agrif_nemo_init()
-      ENDIF
 #endif
       !

@@ -3 +3 @@
 ^/utils/build/mk@HEAD         mk
 ^/utils/tools@HEAD            tools
-^/vendors/AGRIF/dev@HEAD      ext/AGRIF
+^/vendors/AGRIF/dev_r14608_AGRIF_domcfg@HEAD      ext/AGRIF
 ^/vendors/FCM@HEAD            ext/FCM
 ^/vendors/IOIPSL@HEAD         ext/IOIPSL