Skip to content
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

Jump to bottom

Partmc with layers #200

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

Partmc with layers #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9d3e8ef
docker file to run on local desktop
jtgasparik Jul 8, 2024
cde1379
modifying json files to include layers
jtgasparik Jul 8, 2024
635ecd6
test pass with layers
jtgasparik Jul 13, 2024
f5d2f9f
running scenarios/6_camp with layers
jtgasparik Jul 23, 2024
5ca4aaf
corrected Docker file;=
jtgasparik Aug 1, 2024
a0f929d
dockerfile changes
jtgasparik Aug 5, 2024
084b104
dockerfile update
jtgasparik Aug 5, 2024
8dabc25
layer concentrations are now correct
jtgasparik Aug 16, 2024
4b330e6
aero rep json file for testing
jtgasparik Aug 18, 2024
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
12 changes: 6 additions & 6 deletions Dockerfile.camp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ RUN dnf -y update \
sundials-devel \
lapack-devel \
openblas-devel \
git \
gsl-devel \
cmake \
&& dnf clean all
Expand All @@ -33,11 +34,10 @@ RUN curl -LO https://github.com/jacobwilliams/json-fortran/archive/6.1.0.tar.gz
&& make install \
&& cd ~

RUN curl -LO https://github.com/open-atmos/camp/archive/refs/tags/v1.0.0-gamma.tar.gz \
&& tar -zxvf v1.0.0-gamma.tar.gz
RUN git clone https://github.com/open-atmos/camp.git

# Install a modified version of CVODE
RUN cd camp-1.0.0-gamma \
RUN cd camp \
&& tar -zxvf cvode-3.4-alpha.tar.gz \
&& cd cvode-3.4-alpha \
&& mkdir build \
Expand All @@ -54,7 +54,7 @@ ENV LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:/usr/local/lib:/usr/local/lib64:/usr/loc
ENV PATH="${PATH}:/usr/local/jsonfortran-gnu-6.1.0/lib"

# Build CAMP
RUN cd camp-1.0.0-gamma \
RUN cd camp \
&& mkdir build \
&& cd build \
&& export JSON_FORTRAN_HOME="/usr/local/jsonfortran-gnu-6.1.0" \
Expand All @@ -68,11 +68,11 @@ RUN cd camp-1.0.0-gamma \
&& cd ~

# NOTE: Modify .dockerignore to whitelist files/directories to copy.
COPY . /partmc/
COPY partmc_ /partmc/

RUN mkdir /build \
&& cd /build \
&& export CAMP_HOME="/camp-1.0.0-gamma/build/" \
&& export CAMP_HOME="/camp/build/" \
&& cmake -D CMAKE_BUILD_TYPE=release \
-D CMAKE_C_FLAGS_DEBUG="-g" \
-D CMAKE_Fortran_FLAGS_DEBUG="-g" \
Expand Down
2 changes: 1 addition & 1 deletion scenarios/6_camp/aero_init_comp.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# mass fractions
organic_matter.POA 1.0
one_layer.organic_matter.POA 1.0
15 changes: 14 additions & 1 deletion scenarios/6_camp/aerosol_representation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,20 @@
{
"name" : "PartMC single particle",
"type" : "AERO_REP_SINGLE_PARTICLE",
"maximum computational particles" : 10500
"maximum computational particles" : 10500,
"layers": [
{
"name": "one_layer",
"phases": [
"dust",
"sea_salt",
"organic_matter",
"black_carbon",
"other_PM"
],
"covers": "none"
}
]
}
]
}
2 changes: 1 addition & 1 deletion test/camp/aero_init_comp.dat
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# mass fractions
organic_matter.POA 1.0
one_layer.organic_matter.POA 1.0
11 changes: 10 additions & 1 deletion test/camp/aerosol_representation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,16 @@
{
"name" : "PartMC single particle",
"type" : "AERO_REP_SINGLE_PARTICLE",
"maximum computational particles" : 1050
"maximum computational particles" : 1050,
"layers": [
{
"name": "one_layer",
"phases": [
"organic_matter"
],
"covers": "none"
}
]
}
]
}
Loading