Changeset 3769
- Timestamp:
- 2013-02-01T15:56:10+01:00 (11 years ago)
- Location:
- branches/2012/dev_MERGE_2012/NEMOGCM
- Files:
-
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2012/dev_MERGE_2012/NEMOGCM/CONFIG/cfg.txt
r3764 r3769 3 3 GYRE_BFM OPA_SRC TOP_SRC 4 4 GYRE_PISCES OPA_SRC TOP_SRC 5 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC6 5 ORCA2_LIM3 OPA_SRC LIM_SRC_3 7 6 ORCA2_LIM_PISCES OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC … … 9 8 ORCA2_SAS_LIM OPA_SRC SAS_SRC LIM_SRC_2 NST_SRC 10 9 ORCA2_LIM_CFC_C14b OPA_SRC LIM_SRC_2 NST_SRC TOP_SRC 10 ORCA2_LIM OPA_SRC LIM_SRC_2 NST_SRC -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OFF_SRC/nemogcm.F90
r3764 r3769 91 91 istp = nit000 92 92 ! 93 CALL iom_init ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 93 94 DO WHILE ( istp <= nitend .AND. nstop == 0 ) ! time stepping 94 95 ! … … 101 102 IF( lk_mpp ) CALL mpp_max( nstop ) 102 103 END DO 104 #if defined key_iomput 105 CALL xios_context_finalize() ! needed for XIOS+AGRIF 106 #endif 103 107 104 108 ! !------------------------! … … 250 254 ! ! Dynamics 251 255 CALL dta_dyn_init ! Initialization for the dynamics 252 CALL iom_init ! iom_put initialization253 256 254 257 IF(lwp) WRITE(numout,cform_aaa) ! Flag AAAAAAA -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/IOM/iom.F90
r3764 r3769 359 359 i_s = 1 360 360 i_e = jpmax_files 361 #if defined key_iomput362 CALL xios_context_finalize()363 #endif364 361 ENDIF 365 362 -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/nemogcm.F90
r3768 r3769 194 194 ! 195 195 CALL nemo_closefile 196 #if defined key_oasis3 || defined key_oasis4 196 #if defined key_iomput 197 CALL xios_finalize ! end mpp communications with xios 198 # if defined key_oasis3 || defined key_oasis4 197 199 CALL cpl_prism_finalize ! end coupling and mpp communications with OASIS 200 # endif 198 201 #else 199 # if defined key_iomput 200 IF( Agrif_Root() ) THEN 201 CALL xios_finalize ! end mpp communications 202 ENDIF 202 # if defined key_oasis3 || defined key_oasis4 203 CALL cpl_prism_finalize ! end coupling and mpp communications with OASIS 203 204 # else 204 205 IF( lk_mpp ) CALL mppstop ! end mpp communications … … 390 391 ! ! Diagnostics 391 392 IF( lk_floats ) CALL flo_init ! drifting Floats 392 CALL iom_init ! iom_put initialization393 393 IF( lk_diaar5 ) CALL dia_ar5_init ! ar5 diag 394 394 CALL dia_ptr_init ! Poleward TRansports initialization -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step.F90
r3764 r3769 30 30 !!---------------------------------------------------------------------- 31 31 USE step_oce ! time stepping definition modules 32 #if defined key_top33 USE trcstp ! passive tracer time-stepping (trc_stp routine)34 #endif35 #if defined key_agrif36 USE agrif_opa_sponge ! Momemtum and tracers sponges37 #endif38 USE restart ! restart39 32 40 33 IMPLICIT NONE … … 89 82 #endif 90 83 indic = 0 ! reset to no error condition 84 IF( kstp == nit000 ) CALL iom_init ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 91 85 IF( kstp /= nit000 ) CALL day( kstp ) ! Calendar (day was already called at nit000 in day_init) 92 86 CALL iom_setkt( kstp - nit000 + 1 ) ! say to iom that we are at time step kstp … … 276 270 IF( lk_cpl ) CALL sbc_cpl_snd( kstp ) ! coupled mode : field exchanges 277 271 ! 272 #if defined key_iomput 273 IF( kstp == nitend ) CALL xios_context_finalize() ! needed for XIOS+AGRIF 274 #endif 275 ! 278 276 IF( nn_timing == 1 .AND. kstp == nit000 ) CALL timing_reset 279 277 ! -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/OPA_SRC/step_oce.F90
r3764 r3769 14 14 USE iom ! 15 15 USE lbclnk 16 USE restart ! restart 17 #if defined key_iomput 18 USE xios 19 #endif 16 20 17 21 USE daymod ! calendar (day routine) … … 109 113 USE agrif_opa_sponge ! Momemtum and tracers sponges 110 114 #endif 115 #if defined key_top 116 USE trcstp ! passive tracer time-stepping (trc_stp routine) 117 #endif 111 118 !!---------------------------------------------------------------------- 112 119 !! NEMO/OPA 3.3 , NEMO Consortium (2010) -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/SAS_SRC/nemogcm.F90
r3366 r3769 51 51 USE lib_mpp ! distributed memory computing 52 52 #if defined key_iomput 53 USE mod_ioclient53 USE xios 54 54 #endif 55 55 USE sbcssm … … 135 135 ! 136 136 CALL nemo_closefile 137 #if defined key_iomput 138 CALL xios_finalize ! end mpp communications with xios 139 #else 137 140 IF( lk_mpp ) CALL mppstop ! end mpp communications 141 #endif 138 142 ! 139 143 END SUBROUTINE nemo_gcm … … 167 171 #if defined key_iomput 168 172 IF( Agrif_Root() ) THEN 169 CALL init_ioclient( ilocal_comm ) ! exchange io_server nemo local communicator with the io_server173 CALL xios_initialize( "nemo",return_comm=ilocal_comm ) 170 174 ENDIF 171 175 narea = mynode( cltxt, numnam, nstop, ilocal_comm ) ! Nodes selection … … 258 262 CALL sbc_init ! Forcings : surface module 259 263 260 CALL iom_init ! iom_put initialization261 264 IF(lwp) WRITE(numout,*) 'Euler time step switch is ', neuler 262 265 ! -
branches/2012/dev_MERGE_2012/NEMOGCM/NEMO/SAS_SRC/step.F90
r3362 r3769 19 19 USE iom ! 20 20 USE lbclnk 21 #if defined key_iomput 22 USE xios 23 #endif 21 24 22 25 USE daymod ! calendar (day routine) … … 72 75 # endif 73 76 #endif 77 IF( kstp == nit000 ) CALL iom_init ! iom_put initialization (must be done after nemo_init for AGRIF+XIOS+OASIS) 74 78 IF( kstp /= nit000 ) CALL day( kstp ) ! Calendar (day was already called at nit000 in day_init) 75 79 CALL iom_setkt( kstp ) ! say to iom that we are at time step kstp … … 82 86 ! need to keep the same interface 83 87 CALL stp_ctl( kstp, indic ) 88 #if defined key_iomput 89 IF( kstp == nitend ) CALL xios_context_finalize() ! needed for XIOS+AGRIF 90 #endif 84 91 ! 85 92 IF( nn_timing == 1 .AND. kstp == nit000 ) CALL timing_reset
Note: See TracChangeset
for help on using the changeset viewer.