Changeset 6546


Ignore:
Timestamp:
2016-05-17T16:20:29+02:00 (6 years ago)
Author:
frrh
Message:

Commit final changes relating to manual addition of relevant code
from fcm:NEMO.xm/branches/UKMO/dev_r5107_hadgem3_mct@6355.

Note this is a subset of the total changnes… I have ecluded those which
have become or appear redundant or unnecessary.

This version bit compares with the original.

Location:
branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

    r6545 r6546  
    20162016      !!---------------------------------------------------------------------- 
    20172017      ! 
    2018       #if defined key_oasis3 
     2018#if defined key_oasis3 
    20192019      ! If we're trying to shut down cleanly then we need to consider the fact 
    20202020      ! that this could be part of an MPMD configuration - we don't want to 
     
    20232023      CALL oasis_abort(nproc,"mppstop","NEMO initiated abort") 
    20242024 
    2025       #else 
     2025#else 
    20262026 
    20272027      CALL mppsync 
    20282028      CALL mpi_finalize( info ) 
    20292029 
    2030       #endif 
     2030#endif 
    20312031 
    20322032      ! 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r6545 r6546  
    8282 
    8383   REAL(wp), DIMENSION(:,:), ALLOCATABLE ::   exfld   ! Temporary buffer for receiving 
    84  
     84   INTEGER, PUBLIC :: localComm  
    8585   !!---------------------------------------------------------------------- 
    8686   !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     
    120120      IF ( nerror /= OASIS_Ok ) & 
    121121         CALL oasis_abort (ncomp_id, 'cpl_init','Failure in oasis_get_localcomm' ) 
     122      localComm = kl_comm  
    122123      ! 
    123124   END SUBROUTINE cpl_init 
     
    463464         CALL oasis_get_freqs(id, mop, 1, itmp, info) 
    464465#else 
    465          CALL oasis_get_freqs(id,      1, itmp, info) 
    466 #endif 
    467          cpl_freq = itmp(1) 
     466!         CALL oasis_get_freqs(id,      1, itmp, info) 
     467#endif 
     468          cpl_freq = itmp(1) 
     469 
     470#if defined key_oasis3 
     471         cpl_freq = namflddti( id ) 
     472#endif 
    468473      ENDIF 
    469474      ! 
  • branches/UKMO/dev_r5518_MO_couple_package/NEMOGCM/NEMO/OPA_SRC/wrk_nemo.F90

    r6545 r6546  
    485485         ii = ii + 1 
    486486         IF (ii > jparray) CALL ctl_stop('STOP', 'NEMO aborted wrk_allocbase') 
    487                            ! increase the value of jparray (should not be needed as already very big!)      END DO 
     487                           ! increase the value of jparray (should not be needed as already very big!)       
     488      END DO 
    488489       
    489490      IF( SUM( tree(ii)%ishape ) == 0 ) THEN                    ! create a new branch  
Note: See TracChangeset for help on using the changeset viewer.