Changeset 15261 for NEMO/branches/UKMO
- Timestamp:
- 2021-09-15T13:10:27+02:00 (3 years ago)
- Location:
- NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/LBC/lib_mpp.F90
r13311 r15261 665 665 SUBROUTINE mppstop( ld_abort ) 666 666 667 USE mod_oasis ! coupling routines 668 667 #if defined key_oasis3 668 USE mod_oasis, only: oasis_abort ! coupling routines 669 #endif 669 670 !!---------------------------------------------------------------------- 670 671 !! *** routine mppstop *** … … 684 685 ! If we're trying to shut down cleanly then we need to consider the fact 685 686 ! that this could be part of an MPMD configuration - we don't want to 686 ! leave other components deadlocked. 687 688 ! RSRH No! 687 ! leave other components deadlocked. Hence, if aborting we need to use 688 ! oasis_abort not mpi_abort directly! 689 689 690 IF(ll_abort) THEN 690 691 !CALL mpi_abort( MPI_COMM_WORLD ) -
NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbccpl.F90
r15198 r15261 2683 2683 IF ( ssnd(jps_dummy_t)%laction ) THEN 2684 2684 ! RSRH Just set up some arbitrary test pattern for now 2685 ztmp1(:,:) = 1.e+20 2685 2686 DO jj = 1, jpj 2686 2687 DO ji = 1, jpi 2687 ztmp1(ji,jj) = kt + (glamt(ji,jj) * gphit(ji,jj)) 2688 IF (tmask(ji,jj,1) > 0.5) THEN 2689 ztmp1(ji,jj) = kt + (glamt(ji,jj) * gphit(ji,jj)) 2690 ENDIF 2688 2691 ENDDO 2689 2692 ENDDO -
NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/nemogcm.F90
r13443 r15261 41 41 !! nemo_alloc : dynamical allocation 42 42 !!---------------------------------------------------------------------- 43 USE mod_oasis ! RSRH temp 43 #if defined key_oasis3 44 USE mod_oasis ! For coupling 45 #endif 44 46 USE step_oce ! module used in the ocean time stepping module (step.F90) 45 47 USE phycst ! physical constant (par_cst routine) … … 156 158 157 159 IF(lwp) WRITE(numout,cform_aaa) ! Flag AAAAAAA 160 WRITE(numout,*)"RSRH at time stepping" ; flush(numout) 161 158 162 159 163 ! !-----------------------! … … 235 239 ! !== finalize the run ==! 236 240 ! !------------------------! 241 WRITE(numout,*)"RSRH at finalize" ; flush(numout) 237 242 IF(lwp) WRITE(numout,cform_aaa) ! Flag AAAAAAA 238 243 ! … … 246 251 write(numout,*) "RSRH calling nemo_closefile " , lk_oasis; flush(numout) 247 252 CALL nemo_closefile 248 write(numout,*) "RSRH done closefiles " , lk_oasis; flush(numout)249 253 ! 250 254 #if defined key_iomput 251 255 CALL xios_finalize() ! end mpp communications with xios 252 256 253 IF (lk_oasis) CALL oasis_terminate(nerror) 254 CALL mppstop ! RSRH temp for development 255 !IF( lk_oasis ) CALL cpl_finalize() ! end coupling and mpp communications with OASIS 257 #if defined key_oasis3 258 IF (lk_oasis) THEN 259 CALL oasis_terminate(nerror) 260 CALL mppstop ! end mpp communications 261 ELSEIF( lk_mpp ) THEN 262 CALL mppstop ! RSRH temp for development 263 ENDIF 264 #endif 265 256 266 #else 267 ! RSRH It's unclear if the following will work 268 ! since we never compile w/o key_iomput 257 269 IF ( lk_oasis ) THEN 258 270 CALL cpl_finalize() ! end coupling and mpp communications with OASIS … … 294 306 ! !-------------------------------------------------! 295 307 ! 308 296 309 #if defined key_iomput 297 ! IF( Agrif_Root() ) THEN 298 ! IF( lk_oasis ) THEN 299 ! CALL cpl_init( "toyoce", ilocal_comm ) ! nemo local communicator given by oasis 300 ! CALL xios_initialize( "not used" , local_comm =ilocal_comm ) ! send nemo communicator to xios 301 ! ELSE 302 ! CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm ) ! nemo local communicator given by xios 303 ! ENDIF 304 ! ENDIF 305 ! RSRH simplify initialisaton for test 310 IF( Agrif_Root() ) THEN 311 IF(.not.lk_oasis) THEN 312 CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm ) ! nemo local communicator given by xios 313 ENDIF 314 ENDIF 315 316 #if defined key_oasis3 306 317 IF( lk_oasis ) THEN 307 318 CALL mpi_init(nerror) 308 319 CALL oasis_init_comp ( ncomp_id, "toyoce", nerror, .TRUE. ) 309 ! CALL cpl_init( "toyoce", ilocal_comm )310 320 CALL oasis_get_localcomm ( ilocal_comm , nerror ) 311 321 CALL xios_initialize( "toyoce", local_comm =ilocal_comm ) 312 322 ENDIF 323 #endif 324 313 325 CALL mpp_start( ilocal_comm ) 314 #else 315 IF( lk_oasis ) THEN 316 IF( Agrif_Root() ) THEN 317 CALL cpl_init( "toyoce", ilocal_comm ) ! nemo local communicator given by oasis 318 ENDIF 319 CALL mpp_start( ilocal_comm ) 320 ELSE 321 CALL mpp_start( ) 322 ENDIF 323 #endif 326 #endif 327 324 328 ! 325 329 narea = mpprank + 1 ! mpprank: the rank of proc (0 --> mppsize -1 ) … … 352 356 lwp = (narea == 1) .OR. ln_ctl ! control of all listing output print 353 357 ! 354 WRITE(numout,*) "RSRH NEMO start local com=",ilocal_comm ; flush(numout)355 WRITE(numout,*) "RSRH NEMO my rank=",mpprank ; flush(numout)356 358 IF(lwp) THEN ! open listing units 357 359 ! … … 359 361 & CALL ctl_opn( numout, 'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE., narea ) 360 362 ! 361 362 WRITE(numout,*) "RSRH NEMO start local com=",ilocal_comm ; flush(numout)363 WRITE(numout,*) "RSRH NEMO my rank=",mpprank ; flush(numout)364 363 365 364 WRITE(numout,*) … … 654 653 CALL iom_close ! close all input/output files managed by iom_* 655 654 656 write(numout,*) "RSRH after iom_close";flush(numout)657 655 ! 658 656 IF( numstp /= -1 ) CLOSE( numstp ) ! time-step file
Note: See TracChangeset
for help on using the changeset viewer.