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 8181 – NEMO

Changeset 8181


Ignore:
Timestamp:
2017-06-15T15:47:05+02:00 (7 years ago)
Author:
frrh
Message:

Changes for stand-alone ocean GO6 compatibility.

Location:
branches/UKMO/dev_r5518_GC3_couple_pkg_GO6/NEMOGCM/NEMO/OPA_SRC
Files:
2 edited

Legend:

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

    r7985 r8181  
    20072007   SUBROUTINE mppstop 
    20082008    
     2009#if defined key_oasis3 
    20092010   USE mod_oasis      ! coupling routines 
    2010  
     2011#endif 
    20112012      !!---------------------------------------------------------------------- 
    20122013      !!                  ***  routine mppstop  *** 
  • branches/UKMO/dev_r5518_GC3_couple_pkg_GO6/NEMOGCM/NEMO/OPA_SRC/SBC/cpl_oasis3.F90

    r6615 r8181  
    475475#if defined key_oa3mct_v3 
    476476         CALL oasis_get_freqs(id, mop, 1, itmp, info) 
     477#elseif key_oasis3  
     478         itmp(1) = namflddti( id ) 
    477479#else 
    478 !         CALL oasis_get_freqs(id,      1, itmp, info) 
    479          cpl_freq = namflddti( id ) 
    480 #endif 
     480         CALL oasis_get_freqs(id,      1, itmp, info) 
     481#endif 
     482         cpl_freq = itmp(1) 
    481483      ENDIF 
    482484      ! 
     
    527529   END SUBROUTINE oasis_get_localcomm 
    528530 
    529    SUBROUTINE oasis_def_partition(k1,k2,k3) 
     531   SUBROUTINE oasis_def_partition(k1,k2,k3,k4) 
    530532      INTEGER     , INTENT(  out) ::  k1,k3 
    531533      INTEGER     , INTENT(in   ) ::  k2(5) 
     534      INTEGER     , OPTIONAL, INTENT(in   ) ::  k4 
    532535      k1 = k2(1) ; k3 = k2(5) 
    533536      WRITE(numout,*) 'oasis_def_partition: Error you sould not be there...' 
Note: See TracChangeset for help on using the changeset viewer.