Changeset 901
- Timestamp:
- 06/13/19 16:45:42 (5 years ago)
- Location:
- codes/icosagcm/trunk
- Files:
-
- 1 added
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
codes/icosagcm/trunk/bld.cfg
r548 r901 52 52 bld::excl_dep use::netcdf 53 53 bld::excl_dep use::omp_lib 54 bld::excl_dep inc::mpif.h54 bld::excl_dep use::mpi 55 55 bld::excl_dep use::xios 56 56 bld::excl_dep %USE_IOIPSL -
codes/icosagcm/trunk/src/dcmip/dcmip2016_kessler_physic.f90
r548 r901 73 73 ! Input / output parameters 74 74 !------------------------------------------------ 75 75 INTEGER, INTENT(IN) :: nz ! Number of thermodynamic levels in the column 76 76 REAL(8), DIMENSION(nz), INTENT(INOUT) :: & 77 77 theta , & ! Potential temperature (K) … … 92 92 REAL(8), INTENT(IN) :: & 93 93 dt ! Time step (s) 94 95 INTEGER, INTENT(IN) :: nz ! Number of thermodynamic levels in the column96 94 97 95 !------------------------------------------------ -
codes/icosagcm/trunk/src/initial/etat0_heldsz.f90
r899 r901 100 100 101 101 SUBROUTINE init_Teq 102 USE abort_mod 102 103 USE disvert_mod, ONLY : ap,bp 103 104 REAL(rstd),POINTER :: theta_eq(:,:) … … 150 151 151 152 ELSE 152 PRINT *, 'Init_Teq called twice' 153 CALL ABORT 153 CALL dynamico_abort( "Init_Teq called twice" ) 154 154 END IF 155 155 -
codes/icosagcm/trunk/src/initial/etat0_temperature.f90
r548 r901 18 18 USE transfert_omp_mod, ONLY: bcast_omp 19 19 USE free_unit_mod, ONLY : free_unit 20 USE abort_mod 20 21 INTEGER :: unit,ok 21 22 INTEGER :: l … … 34 35 IF (ok/=0) THEN 35 36 WRITE(*,*) "getin_etat0 error: input file ",trim(temperature_file)," not found!" 36 CALL ABORT37 CALL dynamico_abort( "Could not open temperature file." ) 37 38 ENDIF 38 39 ! read in t_profile() line by line, starting from first atmospheric … … 42 43 IF (ok/=0) THEN 43 44 WRITE(*,*) "getin_etat0 error: failed reading t_profile(l) for l=",l 44 CALL ABORT45 CALL dynamico_abort( "Could not read temperature file. " ) 45 46 ENDIF 46 47 ENDDO -
codes/icosagcm/trunk/src/initial/etat0_venus.f90
r899 r901 150 150 3.070e-5, 1.525e-5, 7.950e-6,4.500e-6,2.925e-6, & 151 151 2.265e-6/ 152 153 DO j=jj_begin-1,jj_end+1154 DO i=ii_begin-1,ii_end+1155 ij=(j-1)*iim+i156 CALL xyz2lonlat(xyz_i(ij,:),lon,lat)157 clat(ij)=cos(lat)158 ENDDO159 ENDDO160 161 152 data tempCLee/ 728.187, 715.129, 697.876, 677.284, 654.078, 628.885, & 162 153 602.225, 574.542, 546.104, 517.339, 488.560, 459.932, & … … 171 162 14.001 , 9.599 , 6.504 , 4.439 , 3.126 , 2.370 , & 172 163 2.000/ 164 165 DO j=jj_begin-1,jj_end+1 166 DO i=ii_begin-1,ii_end+1 167 ij=(j-1)*iim+i 168 CALL xyz2lonlat(xyz_i(ij,:),lon,lat) 169 clat(ij)=cos(lat) 170 ENDDO 171 ENDDO 173 172 174 173 pressCLee = etaCLee*9.2e6 -
codes/icosagcm/trunk/src/parallel/mpi_mod.F90
r803 r901 2 2 3 3 #ifdef CPP_USING_MPI 4 INCLUDE 'mpif.h' 4 !INCLUDE 'mpif.h' 5 use mpi 5 6 #else 6 7 INTEGER :: MPI_COMM_WORLD … … 86 87 SUBROUTINE MPI_GATHER 87 88 END 89 90 SUBROUTINE MPI_ABORT(comm, err, ierr) 91 INTEGER :: comm, err, ierr 92 STOP err 93 END 88 94 #endif -
codes/icosagcm/trunk/src/parallel/transfert_mpi.f90
r899 r901 1121 1121 1122 1122 SUBROUTINE send_message_mpi(field,message) 1123 USE abort_mod 1123 1124 USE profiling_mod 1124 1125 USE field_mod … … 1159 1160 PRINT *, 'send_message_mpi : message ' // TRIM(message%name) // & 1160 1161 ' is still open, no call to wait_message_mpi after last send_message_mpi' 1161 CALL ABORT1162 CALL dynamico_abort( "send_message_mpi : message still open" ) 1162 1163 END IF 1163 1164 message%open=.TRUE. ! will be set to .FALSE. by wait_message_mpi … … 2130 2131 USE mpipara 2131 2132 IMPLICIT NONE 2132 2133 INTEGER,INTENT(IN) :: nb 2133 2134 INTEGER,DIMENSION(nb),INTENT(INOUT) :: Var 2134 INTEGER,INTENT(IN) :: nb 2135 2135 2136 2136 IF (.NOT. using_mpi) RETURN 2137 2137 … … 2147 2147 USE mpipara 2148 2148 IMPLICIT NONE 2149 2149 INTEGER,INTENT(IN) :: nb 2150 2150 REAL,DIMENSION(nb),INTENT(INOUT) :: Var 2151 INTEGER,INTENT(IN) :: nb2152 2151 2153 2152 IF (.NOT. using_mpi) RETURN … … 2164 2163 USE mpipara 2165 2164 IMPLICIT NONE 2166 2165 INTEGER,INTENT(IN) :: nb 2167 2166 LOGICAL,DIMENSION(nb),INTENT(INOUT) :: Var 2168 INTEGER,INTENT(IN) :: nb2169 2167 2170 2168 IF (.NOT. using_mpi) RETURN -
codes/icosagcm/trunk/src/parallel/transfert_omp.f90
r815 r901 827 827 SUBROUTINE bcast_omp_igen(Var,Nb,Buff) 828 828 IMPLICIT NONE 829 829 INTEGER,INTENT(IN) :: Nb 830 830 INTEGER,DIMENSION(Nb),INTENT(INOUT) :: Var 831 INTEGER,DIMENSION(Nb),INTENT(INOUT) :: Buff 832 INTEGER,INTENT(IN) :: Nb 831 INTEGER,DIMENSION(Nb),INTENT(INOUT) :: Buff 833 832 834 833 INTEGER :: i … … 851 850 SUBROUTINE bcast_omp_rgen(Var,Nb,Buff) 852 851 IMPLICIT NONE 853 852 INTEGER,INTENT(IN) :: Nb 854 853 REAL,DIMENSION(Nb),INTENT(INOUT) :: Var 855 REAL,DIMENSION(Nb),INTENT(INOUT) :: Buff 856 INTEGER,INTENT(IN) :: Nb 854 REAL,DIMENSION(Nb),INTENT(INOUT) :: Buff 857 855 858 856 INTEGER :: i … … 874 872 SUBROUTINE bcast_omp_lgen(Var,Nb,Buff) 875 873 IMPLICIT NONE 876 874 INTEGER,INTENT(IN) :: Nb 877 875 LOGICAL,DIMENSION(Nb),INTENT(INOUT) :: Var 878 876 LOGICAL,DIMENSION(Nb),INTENT(INOUT) :: Buff 879 INTEGER,INTENT(IN) :: Nb 880 877 881 878 INTEGER :: i 882 879 -
codes/icosagcm/trunk/src/vertical/disvert_apbp.f90
r548 r901 25 25 SUBROUTINE disvert(ap,bp,presnivs) 26 26 ! USE icosa 27 USE abort_mod 27 28 USE mpipara, ONLY: is_mpi_root 28 29 USE omp_para, ONLY: omp_in_parallel … … 46 47 IF (ok/=0) THEN 47 48 WRITE(*,*) "disvert_ap_bp error: input file ",trim(filename)," not found!" 48 CALL ABORT49 CALL dynamico_abort( "disvert_ap_bp : could not open input file" ) 49 50 ENDIF 50 51 ! read in ap() and b() line by line, starting from surface up … … 54 55 IF (ok/=0) THEN 55 56 WRITE(*,*) "disvert_ap_bp error: failed reading ap(l) and bp(l) for l=",l 56 CALL ABORT57 CALL dynamico_abort( "disvert_ap_bp : could not read input file" ) 57 58 ENDIF 58 59 ENDDO
Note: See TracChangeset
for help on using the changeset viewer.