Skip to content

Commit

Permalink
Corrected merge conflict in cosp_config.F90
Browse files Browse the repository at this point in the history
  • Loading branch information
dustinswales committed Oct 26, 2017
1 parent 00b3cb3 commit 04df31a
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions src/cosp_config.F90
Original file line number Diff line number Diff line change
Expand Up @@ -98,8 +98,7 @@ MODULE MOD_COSP_CONFIG
integer,parameter :: &
npres = 7
real(wp),parameter,dimension(npres+1) :: &
pres_binBounds = (/1000., 800., 680., 560., 440., 310., 180., 0./)

pres_binBounds = (/0., 180., 310., 440., 560., 680., 800., 10000./)
real(wp),parameter,dimension(npres) :: &
pres_binCenters = (/90000., 74000., 62000., 50000., 37500., 24500., 9000./)
real(wp),parameter,dimension(2,npres) :: &
Expand Down

0 comments on commit 04df31a

Please sign in to comment.