Changeset 1056
- Timestamp:
- 10/29/20 15:43:28 (3 years ago)
- Location:
- codes/icosagcm/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/trunk/make_icosa
r497 r1056 11 11 full_defined="FALSE" 12 12 with_xios_defined="FALSE" 13 with_oasis_defined="FALSE" 13 14 arch_defined="FALSE" 14 15 parallel_defined="FALSE" … … 65 66 "-with_xios") 66 67 with_xios_defined="TRUE" ; shift ;; 68 69 "-with_oasis") 70 with_oasis_defined="TRUE" ; shift ;; 67 71 68 72 "-no_io") … … 177 181 fi 178 182 183 if [[ "$with_oasis_defined" == "TRUE" ]] 184 then 185 ICOSA_LIB="$ICOSA_LIB $OASIS_LIBDIR $OASIS_LIB" 186 fi 187 188 179 189 if [[ "$external_ioipsl" == "TRUE" ]] 180 190 then -
codes/icosagcm/trunk/src/parallel/mpipara.F90
r1019 r1056 10 10 LOGICAL,SAVE :: is_mpi_root 11 11 LOGICAL,SAVE :: is_mpi_master 12 CHARACTER(LEN=256),SAVE :: using_oasis 12 13 INTEGER,SAVE :: mpi_master 13 14 … … 61 62 IF (using_mpi) THEN 62 63 64 using_oasis='n' 65 CALL getin('using_oasis',using_oasis) 66 67 IF (using_oasis == 'n') THEN 68 63 69 required_mode_str='funneled' 64 70 CALL getin('mpi_threading_mode',required_mode_str) … … 104 110 IF (mpi_threading_mode==MPI_THREAD_MULTIPLE) PRINT*,'MPI_INIT_THREAD : MPI_THREAD_MULTIPLE used' 105 111 106 #ifdef CPP_USING_XIOS 107 CALL xios_initialize("icosagcm",return_comm=comm_icosa) 112 ENDIF 113 114 #ifdef CPP_USING_XIOS 115 CALL xios_initialize("icosa",return_comm=comm_icosa) 108 116 #else 109 117 comm_icosa=MPI_COMM_WORLD … … 143 151 CALL xios_finalize 144 152 #endif 145 IF (using_mpi) CALL MPI_FINALIZE(ierr) 153 IF (using_mpi) THEN 154 IF (using_oasis == 'n') CALL MPI_FINALIZE(ierr) 155 ENDIF 146 156 147 157 END SUBROUTINE finalize_mpipara
Note: See TracChangeset
for help on using the changeset viewer.