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.

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

Electrical Conductivity Implementations take2 #92

Open
wants to merge 40 commits into
base: main
Choose a base branch
from

Conversation

sammykojo
Copy link

No description provided.

sammykojo and others added 30 commits November 21, 2023 11:01
Co-authored-by: Chris Havlin <[email protected]>
Fix for nested loop structure when creating field names in Params_Electric (second-preferred method)
State Variable in, fix for DK2014 (add units as a subscript to Pressure & Temperature variable name)
State Variable in fix for SEO3 (addition of unit as subscript to Temperature variable name)
State Variable in fix for UHO2014 (addition of units as subscript to Pressure & Temperature variable names )
State Variable in fix for poe2010 (addition of units as subscript to Pressure and Temperature variable names)
State Variable in fix for sun2019 (addition of units as subscripts for Temperature & Pressure variable names)
State Variable in for wang2006 (addition of units as subscript for Temperature & Pressure variable names)
State Variable in fix for yosh2009 (addition of units as subscript for Pressure & Temperature variable names)
exclusion of Hydrogen diffusion experiments
Exclusion of H-D diffusion experiments because of inconsistencies (Novella, 2017 & Sun, 2019)

Exclusion of Dai and Karato, 2014 because of experimental design (done at single hydration value)

Inclusion of Jones et al, 2012

Correction of Poe 2010 using Jones 2012 wt% Ch2o in stead of original parameters for ppm Ch2o

Current Electrical Conductivity functions (Esigs):
esig.yosh2009 = yosh2009(T, Ch2o, P);
esig.SEO3 = SEO3(T, Ch2o, P);
esig.poe2010 = poe2010(T, Ch2o, P);
esig.sun2019 = sun2019(T, Ch2o, P);
esig.wang2006 = wang2006(T, Ch2o, P);
esig.UHO2014 = UHO2014(T, Ch2o, P);
esig.jones2012 = jones2012(T, Ch2o, P);

*All corresponding individual functions have been updated
sammykojo and others added 3 commits March 8, 2024 14:56
Correct grammar errors 

Update Possible_methods list
@chrishavlin
Copy link
Member

This is a clean replacement of #73 !

@chrishavlin chrishavlin added the enhancement New feature or request label May 3, 2024
Work In Progress:

ec_LUT
vol2part
@sammykojo sammykojo closed this Jul 9, 2024
@sammykojo sammykojo reopened this Jul 9, 2024
@chrishavlin
Copy link
Member

@sammykojo , a couple quick organizational notes:

  1. LoadSerp.m and ec_LUT.m shouldn't be at the top level of the repository. Not sure where you're using those functions, so not sure where you should move them :) either in Projects/ or somewhere in the vbr/vbrCore?
  2. Do you mind moving all the new ec_ functions to their own directory within vbr/vbrCore/functions/electric ? The vbr_init will recursively add paths, so you should be able to move them and everything should still work without modification.

Let me know when this is at a good for me to really dig in. Thanks for all your work on this!

@chrishavlin
Copy link
Member

chrishavlin commented Aug 22, 2024

Things to do:

@chrishavlin
Copy link
Member

@sammykojo I just pushed a few changes, be sure to git pull locally before continuing development.

CB_015_ec_melt.m also needs some octave compatibility fixes, but I'm not sure the output from the sifre2014_CB2 sub function looked correct when I got it running. Can you upload the resulting figure that you get when running with matlab within a comment here?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants