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 4969 for branches/2014 – NEMO

Changeset 4969 for branches/2014


Ignore:
Timestamp:
2014-12-04T09:45:59+01:00 (9 years ago)
Author:
smasson
Message:

dev_MERGE_2014: minor bugfix in the compilation interface

Location:
branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90

    r4924 r4969  
    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 
  • branches/2014/dev_MERGE_2014/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r4946 r4969  
    406406      INTEGER,INTENT(in) ::   kid   ! variable index 
    407407      !! 
    408       INTEGER :: info 
     408      INTEGER               :: info 
     409      INTEGER, DIMENSION(1) :: itmp 
    409410      !!---------------------------------------------------------------------- 
    410       CALL oasis_get_freqs(kid, 1, cpl_freq, info) 
     411      CALL oasis_get_freqs(kid, 1, itmp, info) 
     412      cpl_freq = itmp(1) 
    411413      ! 
    412414   END FUNCTION cpl_freq 
Note: See TracChangeset for help on using the changeset viewer.