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

Reorganize #67

Merged
merged 108 commits into from
Mar 14, 2024
Merged
Changes from 1 commit
Commits
Show all changes
108 commits
Select commit Hold shift + click to select a range
7668456
add musica c test
boulderdaze Feb 17, 2024
fc38129
add temp directory for the review
boulderdaze Feb 22, 2024
12cdf68
make musica fortran shared lib
boulderdaze Feb 23, 2024
aa830d0
musica fortran working version for the intel compilers
boulderdaze Feb 29, 2024
28a5bc1
clean up musica
boulderdaze Feb 29, 2024
ffc817d
clean up musica-fortran
boulderdaze Mar 1, 2024
f8679e7
reorganizing the cmake files, using MUSICA prefix
K20shores Mar 1, 2024
dc1781f
merging
K20shores Mar 1, 2024
8a0f8cb
renaming directory
K20shores Mar 1, 2024
18785d5
investingating cross-compiler library usage
K20shores Mar 1, 2024
75949c4
things build and link, but segfault happens
K20shores Mar 1, 2024
f0689b1
trying a different interface
K20shores Mar 4, 2024
8e2c20d
sigh...
K20shores Mar 4, 2024
02cb227
c null char
K20shores Mar 4, 2024
46ed7c0
intent
K20shores Mar 4, 2024
cb4e771
intent
K20shores Mar 4, 2024
5192c06
printing things
K20shores Mar 4, 2024
fd737cb
calling the constructor...
K20shores Mar 4, 2024
66d40f3
differnt constructor
K20shores Mar 4, 2024
18801b4
syntax
K20shores Mar 4, 2024
76b7929
removing prints
K20shores Mar 4, 2024
f48b984
comment out prints
K20shores Mar 4, 2024
8856936
trying raw pointer
K20shores Mar 4, 2024
e376078
uhhhh....
K20shores Mar 5, 2024
7696f87
return type
K20shores Mar 5, 2024
369566f
trying to make the interface smaller
K20shores Mar 5, 2024
dd85fe7
fixing type
K20shores Mar 5, 2024
da68aec
adding pointer
K20shores Mar 5, 2024
cb0ce4c
correcting thing
K20shores Mar 5, 2024
08e99d7
wish I could read
K20shores Mar 5, 2024
fa99d32
removing import
K20shores Mar 6, 2024
0ddfd3a
yes, i do
K20shores Mar 6, 2024
7d46194
commenting out print
K20shores Mar 6, 2024
8022265
pass by value
K20shores Mar 6, 2024
dc5b5b4
thing
K20shores Mar 6, 2024
e44e93d
removing value
K20shores Mar 6, 2024
953eb43
uncommenting thing
K20shores Mar 6, 2024
40faee1
trying a thing
K20shores Mar 6, 2024
9495127
adding it back
K20shores Mar 6, 2024
8c8d739
adding invalid
K20shores Mar 6, 2024
18c4716
new interface
K20shores Mar 6, 2024
c82b257
adding failure test
K20shores Mar 6, 2024
6e6991f
trying to fix paths
K20shores Mar 6, 2024
5fd2063
more paths
K20shores Mar 7, 2024
0ec941a
thing
K20shores Mar 7, 2024
e9f04b8
reordering includes, giving up on trying to remove installed directories
K20shores Mar 8, 2024
d99a197
updating tuv branch
K20shores Mar 8, 2024
ab62da1
going back to that version
K20shores Mar 8, 2024
379a84f
smaller interface
K20shores Mar 8, 2024
d8d7fab
getting the test to work
K20shores Mar 8, 2024
26acf06
moving fortran things to the fortran side
K20shores Mar 8, 2024
8eaf68e
removing musica_core, updating tuvx branch
K20shores Mar 8, 2024
333c6d8
removing old tuvx git stuff
K20shores Mar 8, 2024
68589db
what is happening
K20shores Mar 8, 2024
adc6ab6
including tuvx that can be built with gcc 13
K20shores Mar 11, 2024
39a8006
different actions
K20shores Mar 11, 2024
fccd4cd
more actions
K20shores Mar 11, 2024
59a3060
not looking for fortran stuff when we don't need it
K20shores Mar 11, 2024
4d5f6ef
installing dependencies
K20shores Mar 11, 2024
4c4f868
removing unused dependency
K20shores Mar 11, 2024
b632498
trying to set compiler
K20shores Mar 11, 2024
827a5b6
wait maybe it was right
K20shores Mar 11, 2024
60af303
fix clang linking bad c++ version
K20shores Mar 11, 2024
fe72555
trying to add multiple clang versions on ubuntu
K20shores Mar 11, 2024
ef2ef82
removing duplicate build
K20shores Mar 11, 2024
d085aa3
removing unused header
K20shores Mar 11, 2024
e280a10
correcting build
K20shores Mar 11, 2024
7c359fa
seeing if 13 and 14 work
K20shores Mar 11, 2024
d27b082
not specifying clang version
K20shores Mar 11, 2024
5cdea3f
adding readme ci badges
K20shores Mar 11, 2024
e0f40ed
updating doi badge
K20shores Mar 11, 2024
09b913a
only installing micm_core.F90
K20shores Mar 11, 2024
9bd25de
removing json fortran deps
K20shores Mar 11, 2024
00c2404
better openmp find interface
K20shores Mar 11, 2024
615f224
huh, another seg fault
K20shores Mar 11, 2024
3a72fc2
trying a thing
K20shores Mar 11, 2024
2f523bd
undoing one thing, keeping a thing
K20shores Mar 11, 2024
22bdac2
okay so it needs it
K20shores Mar 11, 2024
59cd43d
trying different standard library
K20shores Mar 11, 2024
c8139b5
that didn't work
K20shores Mar 11, 2024
0634794
adding gcc test to github
K20shores Mar 11, 2024
56246e8
commenting out writes
K20shores Mar 12, 2024
1d90f99
pointer assignment
K20shores Mar 12, 2024
c6f5919
yeah, pointer assignment
K20shores Mar 12, 2024
2812178
removing reference to json fortran in module
K20shores Mar 12, 2024
919042b
adding module message
K20shores Mar 12, 2024
472245c
adding fortran install instructions
K20shores Mar 12, 2024
250d12a
some changes
K20shores Mar 12, 2024
a08cfff
verbose
K20shores Mar 12, 2024
cb24aad
actual verbose
K20shores Mar 12, 2024
685f5e5
something different
K20shores Mar 12, 2024
0e73a0f
trying to remove a thing
K20shores Mar 12, 2024
e841540
trying different ubuntu version
K20shores Mar 12, 2024
7a3d1f0
trying a different thing
K20shores Mar 12, 2024
3de8471
maybe here
K20shores Mar 12, 2024
27f402a
maybe this
K20shores Mar 12, 2024
a937230
trying a different interface
K20shores Mar 12, 2024
a2caa3b
trying to pass the pointer by value
K20shores Mar 12, 2024
ed740e3
passing by value
K20shores Mar 12, 2024
9d6f317
catching a bad allocation
K20shores Mar 12, 2024
9b06704
comments
K20shores Mar 13, 2024
dd06229
updating install stuff
K20shores Mar 13, 2024
b7ed7fc
windows builds?
K20shores Mar 13, 2024
9eeab76
adding c compiler for clang
K20shores Mar 13, 2024
fc69924
adding nvhpc dockerfile
K20shores Mar 13, 2024
c51c795
Update src/component_versions.c
K20shores Mar 14, 2024
e72d525
including memcheck build
K20shores Mar 14, 2024
d732ad2
removing gfortran dependencies for builds that don't need them
K20shores Mar 14, 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
Prev Previous commit
Next Next commit
catching a bad allocation
K20shores committed Mar 12, 2024

Verified

This commit was signed with the committer’s verified signature.
commit 9d6f31714ffe6da7174209ae56ae69e7525ac09b
12 changes: 9 additions & 3 deletions src/micm/micm.cpp
Original file line number Diff line number Diff line change
@@ -17,9 +17,15 @@

MICM* create_micm(const char* config_path, int* error_code)
{
MICM* micm = new MICM();
*error_code = micm->create_solver(std::string(config_path));
return micm;
try {
MICM* micm = new MICM();
*error_code = micm->create_solver(std::string(config_path));
return micm;
}
catch (const std::bad_alloc& e) {
*error_code = 1;
return nullptr;
}
}

void delete_micm(const MICM* micm)