Changeset 65 for trunk/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

Timestamp:

01/02/13 18:50:00 (12 years ago)

Author:

smasson

Message:

bugfix for agrf, obc and xios

File:

• trunk/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90 (modified) (5 diffs)

trunk/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90

@@ -167 +167 @@
       !                            !------------------------!
       IF(lwp) WRITE(numout,cform_aaa)   ! Flag AAAAAAA
+      IF(lwp) Write(numout,*) 'Grid Number',Agrif_Fixed()
+      IF(lwp) WRITE(numout,cform_aaa)   ! Flag AAAAAAA
       !
       IF( nstop /= 0 .AND. lwp ) THEN   ! error print
@@ -182 +184 @@
       !
       CALL nemo_closefile
-#if defined key_oasis3 || defined key_oasis4
-      CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
-#else
 # if defined key_iomput
       IF( Agrif_Root() ) THEN
-         CALL xios_finalize             ! end mpp communications
+         CALL xios_finalize                ! end mpp communications
       ENDIF
 # else
       IF( lk_mpp )   CALL mppstop       ! end mpp communications
 # endif
+#if defined key_oasis3 || defined key_oasis4
+      IF( Agrif_Root() ) THEN
+         CALL cpl_prism_finalize           ! end coupling and mpp communications with OASIS
+      ENDIF
 #endif
       !
@@ -228 +231 @@
          CALL xios_initialize( "oceanx",local_comm=ilocal_comm )
 # else
-         CALL  xios_initialize( "nemo",return_comm=ilocal_comm )
+         CALL xios_initialize( "nemo",return_comm=ilocal_comm )
 # endif
       ENDIF
@@ -326 +329 @@
       IF( lk_bdy        )   CALL     tide_init      ! Open boundaries initialisation of tidal harmonic forcing
 
-                            CALL flush(numout)
                             CALL dyn_nept_init  ! simplified form of Neptune effect
-                            CALL flush(numout)
 
                             CALL  istate_init   ! ocean initial state (Dynamics and tracers)
@@ -582 +583 @@
       ENDIF
       !
+      IF( jpnj < jpni ) THEN 
+         ji = jpni
+         jpni = jpnj
+         jpnj = ji
+      ENDIF
+      !
       jpnij = jpni*jpnj
       !