Jinmerge #58
Open
Jinmerge #58
Conversation
This file contains 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
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1907 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…as I am pressed for time. I wouldn't recommend anyone test this yet as makefiles have some harcoded paths from my comp and code is tweaked for my tesla board. Tracker item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1916 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1918 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1954 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1978 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1988 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…changes. No tracker item git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@1991 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…olations when accesssing converted C pointers. No Tracker Item git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2001 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2002 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2003 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2008 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…Tracker Item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2021 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…t changes git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2090 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…ed tracker item git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2115 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…o. Tracker Item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2118 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…o modified Monodomain example. Tracker Item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2121 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…ker Item git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2122 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…model definition. See Tracker Item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2123 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…cording in example code. See tracker item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2124 61e36070-c886-4827-b7c0-ed9e4dc59cc8
…ack dae solver timer using COMMON variables in SOLVER_DAE_SOLVE. Temporarily removed single domain timing as it was producing NANs for some reason. See tracker item 2180 git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2125 61e36070-c886-4827-b7c0-ed9e4dc59cc8
git-svn-id: https://opencmiss.svn.sourceforge.net/svnroot/opencmiss/cm/branches/developers/jin@2186 61e36070-c886-4827-b7c0-ed9e4dc59cc8
Conflicts: ExampleMakefile Makefile src/biodomain_equation_routines.f90 src/classical_field_routines.f90 src/diffusion_equation_routines.f90 src/equations_set_routines.f90 src/external_dae_solver_routines.cu src/field_IO_routines.f90 src/field_routines.f90 src/multi_compartment_transport_routines.f90 src/opencmiss.f90 src/opencmiss_c.f90 src/solver_routines.f90
|
Any comment on this? I'd like to merge it so that I can get everything up-to-date and delete all these branches and get my master correct so that I can branch and start again from clean. Everything is now so confused. |
| @@ -142,11 +142,11 @@ $(EXE_DIR) : | |||
|
|
|||
| $(EXECUTABLE) : $(OBJECTS) $(OPENCMISS_LIBRARY) | |||
| $(EXE_LINK) -o $@ $(OBJECTS) $(OPENCMISS_LIBRARY) $(ELFLAGS) $(EXTERNAL_LIBRARIES) | |||
| # $(EXE_LINK) -o $@ $(OBJECTS) $(OPENCMISS_LIBRARY) $(ELFLAGS) $(EXTERNAL_LIBRARIES) -L/people/vbud003/NVIDIA_GPU_Computing_SDK/C/lib -L/people/vbud003/NVIDIA_GPU_Computing_SDK/C/common/lib/linux -L/people/vbud003/NVIDIA_GPU_Computing_SDK/shared//lib -lcudart -L/people/vbud003/NVIDIA_GPU_Computing_SDK/C/lib -L/people/vbud003/NVIDIA_GPU_Computing_SDK/C/common/lib/linux -L/people/vbud003/NVIDIA_GPU_Computing_SDK/shared//lib -L/usr/local/cuda/lib64/ -lcudart -lcutil_x86_64 -lshrutil_x86_64 | |||
There was a problem hiding this comment.
Looks like this line should be deleted now that the libraries are included in $(EXTERNAL_LIBRARIES) from MakefileCommon.inc
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Merging Jin's branch and bringing cuda electrophysics up-to-date.