New URL for NEMO forge!   http://forge.nemo-ocean.eu

Since March 2022 along with NEMO 4.2 release, the code development moved to a self-hosted GitLab.
This present forge is now archived and remained online for history.
Changeset 4990 for trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90 – NEMO

Ignore:
Timestamp:
2014-12-15T17:42:49+01:00 (9 years ago)
Author:
timgraham
Message:

Merged branches/2014/dev_MERGE_2014 back onto the trunk as follows:

In the working copy of branch ran:
svn merge svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk@HEAD
1 conflict in LIM_SRC_3/limdiahsb.F90
Resolved by keeping the version from dev_MERGE_2014 branch
and commited at r4989

In working copy run:
svn switch svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/trunk
to switch working copy

Run:
svn merge --reintegrate svn+ssh://forge.ipsl.jussieu.fr/ipsl/forge/projets/nemo/svn/branches/2014/dev_MERGE_2014
to merge the branch into the trunk - no conflicts at this stage.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r4691 r4990  
    11661166   SUBROUTINE iom_context_finalize( cdname ) 
    11671167      CHARACTER(LEN=*), INTENT(in) :: cdname 
    1168       !      
    1169       CALL iom_swap( cdname )   ! swap to cdname context 
    1170       CALL xios_context_finalize() ! finalize the context 
    1171       IF( cdname /= "nemo" ) CALL iom_swap( "nemo" )   ! return back to nemo context 
     1168      ! 
     1169      IF( xios_is_valid_context(cdname) ) THEN 
     1170         CALL iom_swap( cdname )   ! swap to cdname context 
     1171         CALL xios_context_finalize() ! finalize the context 
     1172         IF( cdname /= "nemo" ) CALL iom_swap( "nemo" )   ! return back to nemo context 
     1173      ENDIF 
    11721174      ! 
    11731175   END SUBROUTINE iom_context_finalize 
Note: See TracChangeset for help on using the changeset viewer.