-
Notifications
You must be signed in to change notification settings - Fork 16
Add immersion freezing #205
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.
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
tangwhiap
wants to merge
136
commits into
compdyn:master
Choose a base branch
from
tangwhiap:imf
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
136 commits
Select commit
Hold shift + click to select a range
a692f71
change aero_data
tangwhiap 44a075a
add freezing folder
tangwhiap 70e4710
development of freezing process
tangwhiap a31d570
ice nucleation (immersion freezing) development
tangwhiap 8f16bf0
freezing scenario
tangwhiap 7ec13bc
modify freezing scenario
tangwhiap 2cf3381
Delete scenarios/7_freezing/run_scripts directory
tangwhiap ff65ded
Delete scenarios/7_freezing/aero_init_tools directory
tangwhiap f78b80a
Delete scenarios/7_freezing/visual_tools directory
tangwhiap 5c95091
Delete scenarios/7_freezing/out_sese_default1 directory
tangwhiap 6143948
Delete scenarios/7_freezing/data_temp directory
tangwhiap efb3cee
Delete scenarios/7_freezing/__pycache__ directory
tangwhiap ec418fe
remove old directories
tangwhiap 8851a31
Resolve merge conflicts by accepting deletions
tangwhiap c647593
remove files
tangwhiap 8fa3e1c
Delete scenarios/7_freezing/freezing_run.sh
tangwhiap ef0fa57
Delete scenarios/7_freezing/hist.py
tangwhiap f713e41
Delete scenarios/7_freezing/make_pres.py
tangwhiap 5bc0996
Delete scenarios/7_freezing/make_temp.py
tangwhiap ceaf677
Delete scenarios/7_freezing/plot_temp1.py
tangwhiap 4b8a632
Update .gitignore to exclude some freezing scripts
tangwhiap bcad5c3
Merge branch 'imf' of github.com:tangwhiap/partmc into imf
tangwhiap 8688c83
update and modify test cases for freezing
tangwhiap c01b77c
add fortran codes for extracting data and theoretical calculation
tangwhiap 43a8ceb
delete old freezing codes
tangwhiap d4b99bb
remove the freezing timing output
tangwhiap a3aa800
remove the forward ice growth parameters for condense subroutine
tangwhiap 40075be
modify 1_run.sh for freezing scenario
tangwhiap 3ab971d
modify visualization code
tangwhiap 89d1740
add freezing document (tex file)
tangwhiap 1ad2951
modify README and run shell scripts
tangwhiap 7ca770e
modify CMakeList.txt
tangwhiap 4981665
empty
tangwhiap 56a4395
remove the ice growth development for imf branch
tangwhiap ef29b90
add output messages
tangwhiap 69546ff
modify the aero_data.dat and spec file for acommodating the freezing …
tangwhiap f6630b0
fix the conflicts for immersion freezing codes
tangwhiap 6e653f4
update the test settings for weighting, accomodating the freezing codes
tangwhiap 15af245
modify the 4_clean.sh for immersion freezing
tangwhiap 1064ce5
modify README for freezing scenario
tangwhiap f1e60a4
whitelist freezing scenario
jcurtis2 f73236e
fix a bug in geometric random number generator
tangwhiap 6bb6769
Merge branch 'imf' of github.com:tangwhiap/partmc into imf
tangwhiap 64ae238
modify some codes to meet the compiler requirement in Docker
tangwhiap e32c3a5
modify the aero_data.dat and spec file of tchem test case
tangwhiap 685a222
fix the issue of imf in MPI run; modify the imf scheme variable
tangwhiap 840678c
modify camp.spec, adding do_immersion_freezing no
tangwhiap 9782e57
Apply suggestions from code review
tangwhiap 411474d
add abifm parameters for camp test
tangwhiap 5c06fce
Update src/ice_nucleation.F90
tangwhiap 9b38567
Update src/ice_nucleation.F90
tangwhiap abfa072
keep allocate/deallocate in the ice_nucleation.F90 (fix it in the fut…
tangwhiap 3227dd2
rank the test cases alphabetically
tangwhiap b80486c
delete the repeated line
tangwhiap 22aca30
Update src/partmc.F90
tangwhiap f3ef66a
Update src/partmc.F90
tangwhiap 4ef94ce
Update src/run_part.F90
tangwhiap f40ec3c
Update src/partmc.F90
tangwhiap c159539
Update src/run_part.F90
tangwhiap 5fe679f
Update src/run_part.F90
tangwhiap cab740d
Update src/run_part.F90
tangwhiap 07a1e54
Update src/run_part.F90
tangwhiap 9eb5d13
Update test/freezing/pressure.dat
tangwhiap f2b57c1
Update src/run_part.F90
tangwhiap ed07c2d
Update test/freezing/aero_init_dist.dat
tangwhiap 8001a06
Update test/freezing/temp.dat
tangwhiap 9c87302
Update test/freezing/test_freezing_theoretical.F90
tangwhiap 5aae4ae
Update test/freezing/test_freezing_extract.F90
tangwhiap dee21f7
Update scenarios/7_freezing/standard_setting/exp5/temp.dat
tangwhiap fd42131
Update src/env_state.F90
tangwhiap 7bd4ade
Update src/env_state.F90
tangwhiap 55ce6d0
Update src/rand.F90
tangwhiap a62fdc2
Update src/ice_nucleation.F90
tangwhiap bcba8a4
Update src/rand.F90
tangwhiap 6d3dd98
Update src/ice_nucleation.F90
tangwhiap 62c297b
Update src/ice_nucleation.F90
tangwhiap 34debee
Update src/ice_nucleation.F90
tangwhiap 7403d2e
Update src/ice_nucleation.F90
tangwhiap 3eaa069
Update src/ice_nucleation.F90
tangwhiap 1d8ef97
Merge branch 'imf' of github.com:tangwhiap/partmc into imf
tangwhiap f6fd949
Modifications made based on Jeffrey Curtis's comments
tangwhiap 45fc988
remove P_frozen variable
tangwhiap fcedcc6
Modifications made based on Jeffrey Curtis's comments (2)
tangwhiap e9f9a3e
Set random code for warning message
tangwhiap c4708bc
modify the settings issue (delete unused file, delete unused comments…
tangwhiap 144b720
Add label for ABIFM parameters in aero_data.dat
tangwhiap 49d142d
Update src/aero_particle.F90
tangwhiap 7c2e7d3
Update src/ice_nucleation.F90
tangwhiap 5cf57ee
Update src/ice_nucleation.F90
tangwhiap d49ab5b
Update src/aero_particle.F90
tangwhiap 1719342
Update src/aero_state.F90
tangwhiap ff434ed
Update src/env_state.F90
tangwhiap 95d8f8d
Update src/env_state.F90
tangwhiap e3f8abd
Update src/env_state.F90
tangwhiap 2b86ee0
Update src/env_state.F90
tangwhiap d49d723
Update src/aero_state.F90
tangwhiap f4f321b
Update src/aero_state.F90
tangwhiap c939a67
Update src/aero_state.F90
tangwhiap c79803c
Update src/env_state.F90
tangwhiap 69ebd44
Update src/env_state.F90
tangwhiap 8777700
Update src/aero_state.F90
tangwhiap a32972b
Update src/ice_nucleation.F90
tangwhiap efe5438
Update src/ice_nucleation.F90
tangwhiap 1212fcf
Update src/ice_nucleation.F90
tangwhiap c7afeee
Update src/rand.F90
tangwhiap fe21d2f
Update src/ice_nucleation.F90
tangwhiap 7fe2745
modifications following Jeff's comments
tangwhiap d217797
modifications following Jeff's comments
tangwhiap d1daa59
Merge branch 'master' into imf
tangwhiap 9225cd1
Improve the rand_geometric function, link to GSL library
tangwhiap 5806a74
Merge branch 'imf' of github.com:tangwhiap/partmc into imf
tangwhiap 286c96a
Modifications following Jeff's comments
tangwhiap 8afaf9d
change variable name (typo fix) j_het_x_aera -> j_het_x_area
tangwhiap 3477809
fix whitespace issues
jcurtis2 a3a6fa6
Apply the temperature threshold for immersion freezing (<=0 degree ce…
tangwhiap 79f2ae2
Merge branch 'imf' of github.com:tangwhiap/partmc into imf
tangwhiap 195690a
Rename tchem.yml to tchem.yml.temporarily_off
tangwhiap 085ad81
fortitude changes. break long lines
jcurtis2 dc8f24e
Merge branch 'master' into HEAD
slayoo d8c7cf0
add abifm parameters to camp aerosol species
jcurtis2 00234bb
Simplify the freezing scenario, keep only exp8
tangwhiap 73fe08f
Resolve conflicts
tangwhiap e79f406
Update src/ice_nucleation.F90
tangwhiap 2d003f7
Update src/ice_nucleation.F90
tangwhiap fbc9ca7
Change function name env_state_saturated_vapor_pressure_water-> env…
tangwhiap 6dd5b62
Remove duplicated function: env_state_saturated_vapor_pressure_water_2
tangwhiap e7d0543
Modifications based on Jeff's comments
tangwhiap 6493ea7
Modify the document for spec_file_read_immersion_freezing_scheme_type
tangwhiap 6629ee5
Remove unreachable branch
tangwhiap 0fefef5
Add freezing test cases for singular and const
tangwhiap 5efbf4f
Move do_freezing_naive to spec file and add tests for naive algorithrm
tangwhiap 03ecfb1
Add test_freezing_4.sh and test_freezing_5.sh, including relative spe…
tangwhiap b6032c1
reduce number of particles
jcurtis2 ce1b709
reduce output frequency. reduce number of runs
jcurtis2 6d962a3
fix the fixed rand_init issue
jcurtis2 6b13604
Stop tracking 7_freezing scenario
tangwhiap File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -198,12 +198,13 @@ if(ENABLE_SUNDIALS) | |
| endif() | ||
| add_test(test_emission ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh emission) | ||
| add_test(test_fractal ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh fractal) | ||
| add_test(test_freezing ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh freezing) | ||
| add_test(test_loss ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh loss) | ||
| add_test(test_nucleate ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh nucleate) | ||
| add_test(test_mixing_state ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh mixing_state) | ||
| if(ENABLE_MOSAIC) | ||
| add_test(test_mosaic ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh mosaic) | ||
| endif() | ||
| add_test(test_nucleate ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh nucleate) | ||
| if(ENABLE_MPI) | ||
| add_test(test_parallel ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh parallel) | ||
| endif() | ||
|
|
@@ -213,6 +214,7 @@ if (ENABLE_TCHEM) | |
| add_test(test_tchem ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh tchem) | ||
| endif() | ||
| add_test(test_weighting ${CMAKE_BINARY_DIR}/test_run/run_test_directory.sh weighting) | ||
| #>>>>>>> 2341ef410d6f49f3169b8461b5fa8c89dbd3c7a2 | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this seems to be a merge-conflict leftover to be removed? |
||
|
|
||
| ###################################################################### | ||
| # partmc library | ||
|
|
@@ -234,6 +236,7 @@ add_library(partmclib src/aero_state.F90 src/integer_varray.F90 | |
| src/netcdf.F90 src/aero_info.F90 src/aero_info_array.F90 | ||
| src/nucleate.F90 src/condense.F90 src/fractal.F90 src/chamber.F90 | ||
| src/camp_interface.F90 src/photolysis.F90 src/sys.F90 | ||
| src/ice_nucleation.F90 | ||
| src/tchem_interface.F90 | ||
| src/aero_component.F90 | ||
| ${SUNDIALS_SRC} ${GSL_SRC} ${TCHEM_SRC} | ||
|
|
@@ -286,6 +289,22 @@ add_executable(test_bidisperse_extract | |
|
|
||
| target_link_libraries(test_bidisperse_extract ${NETCDF_LIBS}) | ||
|
|
||
| ###################################################################### | ||
| # test_freezing_extract | ||
|
|
||
| add_executable(test_freezing_extract | ||
| test/freezing/test_freezing_extract.F90 src/getopt.F90) | ||
|
|
||
| target_link_libraries(test_freezing_extract ${NETCDF_LIBS} partmclib) | ||
|
|
||
| ###################################################################### | ||
| # test_freezing_theoretical | ||
|
|
||
| add_executable(test_freezing_theoretical | ||
| test/freezing/test_freezing_theoretical.F90) | ||
|
|
||
| target_link_libraries(test_freezing_theoretical partmclib) | ||
|
|
||
| ###################################################################### | ||
| # test_nucleate_ode | ||
|
|
||
|
|
@@ -405,6 +424,13 @@ add_executable(urban_plume_process | |
| scenarios/1_urban_plume/urban_plume_process.F90) | ||
| target_link_libraries(urban_plume_process partmclib) | ||
|
|
||
| ###################################################################### | ||
| # scenarios/7_freezing/freezing_process | ||
|
|
||
| add_executable(freezing_process | ||
| scenarios/7_freezing/freezing_process.F90 src/getopt.F90) | ||
| target_link_libraries(freezing_process partmclib) | ||
|
|
||
| ###################################################################### | ||
| # scenarios/4_chamber/chamber_process | ||
|
|
||
|
|
||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. would it be better to make it a part of the web-publishable doxygen html? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| \documentclass{article} | ||
| \usepackage{amsmath} | ||
| \usepackage[margin=2cm]{geometry} | ||
| \usepackage{longtable} | ||
| \usepackage{comment} | ||
|
|
||
| \begin{document} | ||
|
|
||
| \section{Symbol list} | ||
| \label{sec:symbol-list} | ||
|
|
||
| \newcommand{\rr}{\raggedright} | ||
| \newcommand{\tn}{\tabularnewline\hline} | ||
| \renewcommand{\arraystretch}{1.5} | ||
| \begin{longtable}{|l|p{5.5cm}|l|l|p{4.5cm}|} | ||
| \hline \textbf{Symbol} & \textbf{Meaning} & \textbf{Type} & \textbf{Units} & \textbf{Reference} \tn | ||
| \hline \endhead | ||
| \(i\) & species index. & index & discrete & \tn | ||
| \( A_j \) & The total surface area of the INP. & function & $m^2$ & \tn | ||
| \( A_j^\text{(i)} \) & Surface area of \( i \)th species. & function & $m^2$ & \tn | ||
| \( a_{\text{w}} \) & Water activity of the droplet in which the INP is immersed. & function & 1 & eq.~\ref{eq:4}\tn | ||
| \( a_\text{w}^\text{ice} \) & Water activity in equilibrium with ice. & function & 1 & eq.~\ref{eq:5} \tn | ||
| \(a_\text{INAS}\) & INAS parameter for singular scheme. & constant & $K^{-1}$ & Niemand et al., 2012 \tn | ||
| \(b_\text{INAS}\) & INAS parameter for singular scheme. & constant & 1 & Niemand et al., 2012 \tn | ||
| \( \Delta t \) & Time interval. & function & $s$ & \tn | ||
| \( e_\text{s} \) & Saturated vapor pressure with respect to water. & function & Pa & eq.~\ref{eq:2} \tn | ||
| \( e_\text{s}^\text{ice} \) & Saturated vapor pressure with respect to ice. & function & Pa & eq.~\ref{eq:3} \tn | ||
| \( H \) & Relative humidity with respect to water. & dynamics & 1 & \tn | ||
| \( J_{\text{het}} \) & A constant heterogeneous freezing rate for all particles (for the constant nucleation rate scheme only) & constant & $m^{-2}s^{-1}$ & \tn | ||
| \( J_{\text{het}}^{(i)} \) & Heterogeneous freezing rate coefficients of the \( i \)th species. & function & $m^{-2}s^{-1}$ & eq.~\ref{eq:6} \tn | ||
| \( m_i, c_i \) & ABIFM parameters of \( i^\text{th} \) species. & constant & 1 & Knopf et al., 2013 \tn | ||
| \(n_0\) & An unit constant (=1 $m^{-2}$). & constant & $m^{-2}$ & \tn | ||
| \( N_\text{s} \) & The total number of species covering the surface of the INP. & constant & 1 & \tn | ||
| \( P_{\text{frz,}j} (\Delta t)\) & The freezing probability of $j^\text{th}$ particle within a time interval of $\Delta t$. & function & 1 & eq.~\ref{eq:1},eq.~\ref{eq:7} \tn | ||
| \(p_j\) & A random number uniformly distributed in [0,1] regarding the sampling of $j^\text{th}$ particle. & function & 1 & eq.~\ref{eq:8} \tn | ||
| \(T\) & Current environmental temperature & prescribed & $K$ & \tn | ||
| \(T_0\) & Water freezing temperature & constant & K & \verb+env_state%temp+ \tn | ||
| \(T_{\text{m,}j}\) & The freezing temperature of the $j^\text{th}$ particle. & function & K & eq.~\ref{eq:9} \tn | ||
|
|
||
| \end{longtable} | ||
|
|
||
| \begin{comment} | ||
| \( J_{\text{het}}^{(i)} \) & Heterogeneous freezing rate coefficients of the \( i \)th species. \\ | ||
| \( A_i \) & Surface area of \( i \)th species. \\ | ||
| \( A \) & The total surface area of the INP. \\ | ||
| \( \Delta t \) & Time interval. \\ | ||
| \( a_{\text{w}} \) & Water activity of the droplet in which the INP is immersed. \\ | ||
| \( a_\text{w}^\text{ice} \) & Water activity in equilibrium with ice. \\ | ||
| \( RH \) & Relative humidity with respect to water. \\ | ||
| \( e_\text{s} \) & Saturated vapor pressure with respect to water. \\ | ||
| \( e_\text{s}^\text{ice} \) & Saturated vapor pressure with respect to ice. \\ | ||
| \( m_i, c_i \) & ABIFM parameters of \( i^\text{th} \) species. \\ | ||
| \( N_\text{s} \) & The total number of species covering the surface of the INP. \\ | ||
| \hline | ||
| \end{comment} | ||
|
|
||
| \section{Equations} | ||
| \label{sec:equations} | ||
|
|
||
| \subsection{Time-dependent scheme with a constant nucleation rate} | ||
| \begin{equation} | ||
| P_{\text{frz,}j}(\Delta t) = 1 - \exp\left(J_{\text{het}} \cdot A_j \cdot \Delta t \right) \label{eq:1} | ||
| \end{equation} | ||
|
|
||
| \subsection{Time-dependent ABIFM scheme} | ||
| \begin{equation} | ||
| \begin{split} | ||
| e_\text{s}(T) &= \exp \left\{ 54.842763 - \frac{6763.22}{T} - 4.21 * \ln{T} + 0.000367T \right.\\ | ||
| &+ \left. \tanh \left[{0.0415 \cdot (T - 218.8) \cdot (53.878 - \frac{1331.22}{T} - 9.44523 \ln{T} + 0.014025T)}\right] \right\} \label{eq:2} | ||
| \end{split} | ||
| \end{equation} | ||
| \begin{equation} | ||
| e_\text{s}^\text{ice} (T) = \exp \left( 9.550426 - \frac{5723.265}{T} + 3.53068 \cdot \ln{T} - 0.00728332T\right). \label{eq:3} | ||
| \end{equation} | ||
| \begin{align} | ||
| a_{\text{w}} &= 1 \label{eq:4} \\ | ||
| a_\text{w}^\text{ice} &= \frac{e_\text{s}^\text{ice}(T)}{e_\text{s}(T)} \label{eq:5} \\ | ||
| \log_{10}J_{\text{het}}^{(i)} &= m_{\text{i}} \cdot (a_{\text{w}} - a_\text{w}^\text{ice}) + c_i \label{eq:6} \\ | ||
| P_{\text{frz,}j}(\Delta t) &= 1 - \exp\left[ -\sum_{i=1}^{N_{\text{s}}} (A_j^\text{(i)} \cdot J_{\text{het}}^{(i)}) \cdot \Delta t \right] \label{eq:7} | ||
| \end{align} | ||
|
|
||
| \subsection{Singular scheme} | ||
| \begin{equation} | ||
| p_j = random() \in [0,1] \label{eq:8} | ||
| \end{equation} | ||
|
|
||
| \begin{equation} | ||
| T_{\text{m,}j} = T_0 + \frac{1}{a_\text{INAS}} \left[\ln{\left( \frac{\ln{(1-p_j)} + \exp{\left(-A_j n_0 \exp{\left(-a_\text{INAS} T_0 + b_\text{INAS}\right)}\right)}}{-A_j n_0} \right)} - b_\text{INAS}\right] \label{eq:9} | ||
| \end{equation} | ||
| \end{document} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| # dens (kg/m^3) ions in soln (1) molec wght (kg/mole) kappa (1) | ||
| SO4 1800 0 96d-3 0.65 | ||
| NO3 1800 0 62d-3 0.65 | ||
| Cl 2200 0 35.5d-3 1.28 | ||
| NH4 1800 0 18d-3 0.65 | ||
| MSA 1800 0 95d-3 0.53 | ||
| ARO1 1400 0 150d-3 0.1 | ||
| ARO2 1400 0 150d-3 0.1 | ||
| ALK1 1400 0 140d-3 0.1 | ||
| OLE1 1400 0 140d-3 0.1 | ||
| API1 1400 0 184d-3 0.1 | ||
| API2 1400 0 184d-3 0.1 | ||
| LIM1 1400 0 200d-3 0.1 | ||
| LIM2 1400 0 200d-3 0.1 | ||
| CO3 2600 0 60d-3 0.53 | ||
| Na 2200 0 23d-3 1.28 | ||
| Ca 2600 0 40d-3 0.53 | ||
| OIN 2600 0 1d-3 0.1 | ||
| OC 1000 0 1d-3 0.001 | ||
| BC 1800 0 1d-3 0 | ||
| H2O 1000 0 18d-3 0 | ||
| # dens (kg/m^3) ions in soln (1) molec wght (kg/mole) kappa (1) abifm_m (1) abifm_c (1) | ||
| SO4 1800 0 96d-3 0.65 0 0 | ||
| NO3 1800 0 62d-3 0.65 0 0 | ||
| Cl 2200 0 35.5d-3 1.28 0 0 | ||
| NH4 1800 0 18d-3 0.65 0 0 | ||
| MSA 1800 0 95d-3 0.53 0 0 | ||
| ARO1 1400 0 150d-3 0.1 0 0 | ||
| ARO2 1400 0 150d-3 0.1 0 0 | ||
| ALK1 1400 0 140d-3 0.1 0 0 | ||
| OLE1 1400 0 140d-3 0.1 0 0 | ||
| API1 1400 0 184d-3 0.1 0 0 | ||
| API2 1400 0 184d-3 0.1 0 0 | ||
| LIM1 1400 0 200d-3 0.1 0 0 | ||
| LIM2 1400 0 200d-3 0.1 0 0 | ||
| CO3 2600 0 60d-3 0.53 0 0 | ||
| Na 2200 0 23d-3 1.28 0 0 | ||
| Ca 2600 0 40d-3 0.53 0 0 | ||
| OIN 2600 0 1d-3 0.1 0 0 | ||
| OC 1000 0 1d-3 0.001 0 0 | ||
| BC 1800 0 1d-3 0 0 0 | ||
| H2O 1000 0 18d-3 0 0 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,21 +1,21 @@ | ||
| # dens (kg/m^3) ions in soln (1) molec wght (kg/mole) kappa (1) | ||
| SO4 1800 0 96d-3 0.65 | ||
| NO3 1800 0 62d-3 0.65 | ||
| Cl 2200 0 35.5d-3 1.28 | ||
| NH4 1800 0 18d-3 0.65 | ||
| MSA 1800 0 95d-3 0.53 | ||
| ARO1 1400 0 150d-3 0.1 | ||
| ARO2 1400 0 150d-3 0.1 | ||
| ALK1 1400 0 140d-3 0.1 | ||
| OLE1 1400 0 140d-3 0.1 | ||
| API1 1400 0 184d-3 0.1 | ||
| API2 1400 0 184d-3 0.1 | ||
| LIM1 1400 0 200d-3 0.1 | ||
| LIM2 1400 0 200d-3 0.1 | ||
| CO3 2600 0 60d-3 0.53 | ||
| Na 2200 0 23d-3 1.28 | ||
| Ca 2600 0 40d-3 0.53 | ||
| OIN 2600 0 1d-3 0.1 | ||
| OC 1000 0 1d-3 0.001 | ||
| BC 1800 0 1d-3 0 | ||
| H2O 1000 0 18d-3 0 | ||
| # dens (kg/m^3) ions in soln (1) molec wght (kg/mole) kappa (1) abifm_m (1) abifm_c (1) | ||
| SO4 1800 0 96d-3 0.65 0 0 | ||
| NO3 1800 0 62d-3 0.65 0 0 | ||
| Cl 2200 0 35.5d-3 1.28 0 0 | ||
| NH4 1800 0 18d-3 0.65 0 0 | ||
| MSA 1800 0 95d-3 0.53 0 0 | ||
| ARO1 1400 0 150d-3 0.1 0 0 | ||
| ARO2 1400 0 150d-3 0.1 0 0 | ||
| ALK1 1400 0 140d-3 0.1 0 0 | ||
| OLE1 1400 0 140d-3 0.1 0 0 | ||
| API1 1400 0 184d-3 0.1 0 0 | ||
| API2 1400 0 184d-3 0.1 0 0 | ||
| LIM1 1400 0 200d-3 0.1 0 0 | ||
| LIM2 1400 0 200d-3 0.1 0 0 | ||
| CO3 2600 0 60d-3 0.53 0 0 | ||
| Na 2200 0 23d-3 1.28 0 0 | ||
| Ca 2600 0 40d-3 0.53 0 0 | ||
| OIN 2600 0 1d-3 0.1 0 0 | ||
| OC 1000 0 1d-3 0.001 0 0 | ||
| BC 1800 0 1d-3 0 0 0 | ||
| H2O 1000 0 18d-3 0 0 0 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.