Skip to content

Peatlands pull request #310

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
larsonej wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Peatlands pull request #310

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
9862085
testing commit
larsonej Jan 18, 2018
e7c8e90
push test 2
Jan 18, 2018
84bdb8e
Merge branch 'master' of https://github.com/EDmodel/ED2
Jan 31, 2018
6e342e7
Merge branch 'master' of https://github.com/EDmodel/ED2
Feb 5, 2018
acfda71
Long overdue update. Includes large changes to soil_respiration. Trac…
Sep 19, 2018
5588b1a
Added flags ivertresp and isoiltext to soil carbon changes so they ca…
Sep 3, 2019
7d62eea
fixed bugs in dynamic carbon module
Sep 11, 2019
3d65562
not sure what happened to model. currently crashing. possible changes…
Sep 13, 2019
2928683
problem might be with initcarb
Sep 13, 2019
a9bd829
fixed bug with evaporation and made 9 new soil layers to smooth trans…
Dec 19, 2019
aed8b26
big fixes from last update
Dec 19, 2019
c331722
Bug fixes to heterotrophic respiration for non-vertically resolved re…
Jan 24, 2020
6d6cda9
Mainly, increased albedo for peatlands in radiate_driver. Also, added…
Feb 18, 2020
ca3d3cc
small change to min cosz and bug fix
Feb 19, 2020
c55c132
increased albedo of peat to limit excess surface warming
Feb 19, 2020
8cfb815
Added Aw, At to output. Also, increased peat albedo slightly and incr…
May 15, 2020
0a4555c
updated snow density, again
Jul 22, 2020
2114224
cleaned code for mainline pull request
Jul 24, 2020
3171a17
small bug fix
Jul 24, 2020
ca95d7a
small bug
Jul 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,4 +158,10 @@ ED/build/post_process/*
ED/build/thermal_sums/*
ED/build/ED2IN*
ED/build/allom_param.txt
ED/build/pft_sizes.txt
ED/build/pft_sizes.txt

#EJL
ED/run*
ED/NARR*
ED/tower_runs
ED/regional
2 changes: 2 additions & 0 deletions ED/build/install.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,8 @@
# usage example: #
# #
# install.sh -k A -p intel #
# install.sh -k A -s 1 -p odyssey
# install.sh -k E -p odyssey
#------------------------------------------------------------------------------------------#

#----- Define the number of arguments. ----------------------------------------------------#
Expand Down
6 changes: 3 additions & 3 deletions ED/build/make/include.mk.odyssey
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ BASE=$(ED_ROOT)/build/
#------------------------------------------------------------------------------------------#
USE_HDF5=1
#HDF5_PATH=/n/sw/hdf5/hdf5-1.8.2_intel-11.0.083
HDF5_PATH=/n/sw/centos6/hdf5-1.8.11_openmpi-1.8.3_intel-13.0.079
#HDF5_PATH=/n/sw/centos6/hdf5-1.8.11_openmpi-1.8.3_intel-13.0.079
HDF5_INCS=-I$(HDF5_PATH)/include
HDF5_LIBS= -lz -lm -L$(HDF5_PATH)/lib -lhdf5 -lhdf5_fortran -lhdf5_hl
#------------------------------------------------------------------------------------------#
Expand Down Expand Up @@ -128,10 +128,10 @@ ifeq ($(KIND_COMP),D)
endif
ifeq ($(KIND_COMP),E)
USE_INTERF=1
F_OPTS= -FR -O3 -recursive -traceback -assume byterecl -static
F_OPTS= -FR -O3 -recursive -traceback -assume byterecl -static -qopenmp
C_OPTS= -O3 -DLITTLE -traceback -static
F_LOWO_OPTS=-FR -O2 -recursive -traceback -assume byterecl -static
LOADER_OPTS=-FR -O3 -recursive -traceback -assume byterecl
LOADER_OPTS=-FR -O3 -recursive -traceback -assume byterecl -qopenmp
#---------------------------------------------------------------------------------------#
endif
#------------------------------------------------------------------------------------------#
Expand Down
27 changes: 23 additions & 4 deletions ED/run/ED2IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,8 +304,8 @@ $ED_NL
! SFILOUT -- Path and prefix for history files. !
!---------------------------------------------------------------------------------------!

NL%FFILOUT = '/mypath/generic-prefix'
NL%SFILOUT = '/mypath/generic-prefix'
NL%FFILOUT = '/n/moorcroftfs5/larsonej/Master/ED2/ED/run/analy'
NL%SFILOUT = '/n/moorcroftfs5/larsonej/Master/ED2/ED/run/histo'

!---------------------------------------------------------------------------------------!

Expand Down Expand Up @@ -358,7 +358,7 @@ $ED_NL
!
!
!---------------------------------------------------------------------------------------!
NL%IED_INIT_MODE = 3
NL%IED_INIT_MODE = 0
!---------------------------------------------------------------------------------------!


Expand Down Expand Up @@ -419,6 +419,7 @@ $ED_NL
!---------------------------------------------------------------------------------------!
NL%NZG = 9
NL%NZS = 1
NL%NZL = 9
!---------------------------------------------------------------------------------------!


Expand Down Expand Up @@ -526,7 +527,25 @@ $ED_NL
NL%STGOFF = 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00
!---------------------------------------------------------------------------------------!


!---------------------------------------------------------------------------------------!
! Soil organic grid and initial conditions if no file is provided: !
! !
! OLZ - soil depth in m. Values must be negative and go from the deepest layer to !
! the top. !
! OLMSTR - this is the initial soil moisture, now given as the soil moisture index. !
! Values can be fraction, in which case they will be linearly interpolated !
! between the special points (e.g. 0.5 will put soil moisture half way !
! between the wilting point and field capacity). !
! -1 = dry air soil moisture !
! 0 = wilting point !
! 1 = field capacity !
! 2 = porosity (saturation) !
! OTGOFF - initial temperature offset (soil temperature = air temperature + offset) !
!---------------------------------------------------------------------------------------!
NL%OLZ = -2.307, -1.789, -1.340, -0.961, -0.648, -0.400, -0.215, -0.089, -0.020
NL%OLMSTR = 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00, 1.00
NL%OTGOFF = 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00, 0.00
!---------------------------------------------------------------------------------------!


!---------------------------------------------------------------------------------------!
Expand Down
Empty file added ED/src/author
View file
Open in desktop
Empty file.
Empty file added ED/src/brief
View file
Open in desktop
Empty file.
Empty file added ED/src/details
View file
Open in desktop
Empty file.
Loading