Changeset 11914 for NEMO/branches
- Timestamp:
- 2019-11-15T16:21:47+01:00 (5 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/DIA/diawri.F90
r11913 r11914 934 934 ! 935 935 CALL iom_close( inum ) 936 937 IF (cdfile_name == "output.abort") THEN938 CALL ctl_stop('STOP', 'NEMO abort from dia_wri_state')939 END IF940 941 936 ! 942 937 END SUBROUTINE dia_wri_state -
NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/SBC/cpl_oasis3.F90
r11913 r11914 42 42 PUBLIC cpl_freq 43 43 PUBLIC cpl_finalize 44 #if defined key_mpp_mpi45 INCLUDE 'mpif.h'46 #endif47 44 48 INTEGER, PARAMETER :: localRoot = 049 LOGICAL :: commRank ! true for ranks doing OASIS communication50 #if defined key_cpl_rootexchg51 LOGICAL :: rootexchg =.true. ! logical switch52 #else53 LOGICAL :: rootexchg =.false. ! logical switch54 #endif55 45 56 46 INTEGER, PUBLIC :: OASIS_Rcv = 1 !: return code if received field … … 97 87 98 88 REAL(wp), DIMENSION(:,:), ALLOCATABLE :: exfld ! Temporary buffer for receiving 99 INTEGER, PUBLIC :: localComm100 89 101 90 !!---------------------------------------------------------------------- … … 136 125 IF ( nerror /= OASIS_Ok ) & 137 126 CALL oasis_abort (ncomp_id, 'cpl_init','Failure in oasis_get_localcomm' ) 138 localComm = kl_comm139 127 ! 140 128 END SUBROUTINE cpl_init … … 525 513 CALL oasis_get_freqs(id, mop, 1, itmp, info) 526 514 #else 527 ! CALL oasis_get_freqs(id, 1, itmp, info) 528 cpl_freq = namflddti( id ) 515 CALL oasis_get_freqs(id, 1, itmp, info) 529 516 #endif 517 cpl_freq = itmp(1) 530 518 ENDIF 531 519 ! -
NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/SBC/sbccpl.F90
r11913 r11914 219 219 ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) ) ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init) 220 220 #endif 221 !ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 222 ! Hardwire only two models as nn_cplmodel has not been read in 223 ! from the namelist yet. 224 ALLOCATE( xcplmask(jpi,jpj,0:2) , STAT=ierr(3) ) 221 ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) ) 225 222 ! 226 223 IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(4) ) … … 336 333 337 334 ! ! allocate sbccpl arrays 338 !IF( sbc_cpl_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )335 IF( sbc_cpl_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 339 336 340 337 ! ================================ ! -
NEMO/branches/UKMO/NEMO_4.0.1_GC_couple_pkg/src/OCE/SBC/sbcmod.F90
r11913 r11914 291 291 ! !* OASIS initialization 292 292 ! 293 IF( lk_oasis ) THEN 294 IF( sbc_cpl_alloc() /= 0 ) CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' ) 295 CALL sbc_cpl_init( nn_ice ) ! Must be done before: (1) first time step 296 ! (2) the use of nn_fsbc 297 ENDIF 293 IF( lk_oasis ) CALL sbc_cpl_init( nn_ice ) ! Must be done before: (1) first time step 294 ! ! (2) the use of nn_fsbc 298 295 ! nn_fsbc initialization if OPA-SAS coupling via OASIS 299 296 ! SAS time-step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly
Note: See TracChangeset
for help on using the changeset viewer.