tilbud
commented
4 years ago Conflicts?Sent from my Verizon, Samsung Galaxy smartphone -------- Original message --------From: Kathe Todd-Brown notifications@github.com Date: 6/10/20 3:54 PM (GMT-05:00) To: tilbud/rCTM rCTM@noreply.github.com Cc: Subscribed subscribed@noreply.github.com Subject: [tilbud/rCTM] Update Jims branch (#37) Jim looks like there are some on-trivial conflicts here. I'll leave it to you to decide what you want to take from our refactoring and what you want to leave.
You can view, comment on, or merge this pull request online at: https://github.com/tilbud/rCTM/pull/37 Commit Summary
Update README.mdRevert "Update README.md"Added pull_dependencies, a shell script to pull dependent functions.added a list of functionnames for use in pull_dependencies.shAdded variable list with descriptions.playing with output formating for vignetteUpdate README.mdRevert "Update README.md"Testing GravizoUndo TestAdded script that makes a pretty chart showing function relationships.minor debugging of model structureFixed merge conflictChanged variable names to match new naming conventionsundocumented variables are now documented with better namesrenamed some functions to match new naming conventions and updated repository to reflect new function namesMerge pull request #35 from ktoddbrown/JimH-devMerge pull request #6 from jessicah3334/JimH-devMerge pull request #8 from ktoddbrown/JimH-devMerge pull request #36 from ktoddbrown/master File Changes
M CONTRIBUTING.md (14) M NAMESPACE (6) M R/addCohort.R (41) M R/animateCohorts.R (6) M R/availableSediment.R (12) M R/buildHighTideScenario.R (28) M R/buildScenarioCurve.R (52) R R/calculateDepthOfNonRootVolume.R (12) R R/convertProfileAgeToDepth.R (2) A R/convertZStarToZ.R (12) A R/convertZToZstar.R (16) M R/deliverSedimentFlexibly.R (28) M R/deliveredSediment3TidalCycle.R (32) M R/deliveredSedimentSimple.R (26) M R/floodTimeFromDatum.R (4) M R/massLiveRoots.R (13) M R/predictLunarNodalCycle.R (13) M R/runMemWithCohorts.R (58) M R/sedimentInputs.R (6) R R/testCases.R (0) D R/zStarToZ.R (12) D R/zToZstar.R (16) M README.md (7) M R_notPackage/CTMv6p0.R (2) M R_notPackage/EZ MEM.R (44) M R_notPackage/InundationFromMHWandMLW.R (16) M R_notPackage/PriorSensitivityAnalysis.R (18) M R_notPackage/devCohortModel.R (28) M R_notPackage/fillDepthsUsingSimpleCTM.R (10) M R_notPackage/full_blown_MEM_example_Annapolis.R (12) M docs/MEM_Variables.csv (64) M docs/MEM_parameters_inputs.md (6) M docs/functionnames.txt (2) M docs/make_dependent_functions_chart.R (8) M man/CTMv6.1_vba_testcase.Rd (2) M man/addCohort.Rd (16) M man/animateCohorts.Rd (4) M man/availableSediment.Rd (6) M man/buildHighTideScenario.Rd (16) M man/buildScenarioCurve.Rd (12) M man/convertProfile_AgeToDepth.Rd (8) M man/deliverSedimentFlexibly.Rd (20) M man/deliveredSediment3TidalCycle.Rd (36) M man/deliveredSedimentSimple.Rd (20) M man/depthOfNonRootVolume.Rd (12) M man/massLiveRoots.Rd (8) M man/predictLunarNodalCycle.Rd (6) M man/runMemWithCohorts.Rd (28) M man/sedimentInputs.Rd (4) M man/zStarToZ.Rd (12) M man/zToZstar.Rd (8) M tests/testthat/test-depthOfNonRootVolumne.R (2) M vignettes/Benchmark.Rmd (24) M vignettes/ModelStructure.Rmd (4) M vignettes/OLD/ToyModelExamples.Rmd (50) M vignettes/OLD/animateMemDev.Rmd (52) M vignettes/OLD/parameterSensivity.Rmd (22) M vignettes/OLD/rCTM_demo.Rmd (2) M vignettes/rFullBlownMemDev.Rmd (88) M vignettes/sampleData/annapolisTideGauge.csv (2) Patch Links:
https://github.com/tilbud/rCTM/pull/37.patchhttps://github.com/tilbud/rCTM/pull/37.diff — You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHub, or unsubscribe. [ { "@context": "http://schema.org", "@type": "EmailMessage", "potentialAction": { "@type": "ViewAction", "target": "https://github.com/tilbud/rCTM/pull/37", "url": "https://github.com/tilbud/rCTM/pull/37", "name": "View Pull Request" }, "description": "View this Pull Request on GitHub", "publisher": { "@type": "Organization", "name": "GitHub", "url": "https://github.com" } } ]
ktoddbrown
HolmquistJ
Jim looks like there are some on-trivial conflicts here. I'll leave it to you to decide what you want to take from our refactoring and what you want to leave.