Skip to content

Feature/update apr13#26

Merged
climbfuji merged 7 commits intodevelopfrom
feature/update_apr13
Apr 20, 2023
Merged

Feature/update apr13#26
climbfuji merged 7 commits intodevelopfrom
feature/update_apr13

Conversation

@cmgas
Copy link
Contributor

@cmgas cmgas commented Apr 13, 2023

@cmgas cmgas requested a review from climbfuji April 13, 2023 22:52
@cmgas cmgas assigned shlyaeva and cmgas and unassigned shlyaeva Apr 13, 2023
@cmgas cmgas requested a review from shlyaeva April 13, 2023 22:52
Copy link
Collaborator

@shlyaeva shlyaeva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested for ATM, works as expected. soca branch is missing on the remote, so I haven't tested the rest yet.

CMakeLists.txt Outdated
ecbuild_bundle( PROJECT femps GIT "https://github.com/jcsda-internal/femps.git" TAG 1.2.0 )
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH feature/ufs_dom ) # updated from develop on jan28
ecbuild_bundle( PROJECT soca GIT "https://github.com/jcsda-internal/soca.git" BRANCH feature/ufs_dom ) # updated from develop on jan28
ecbuild_bundle( PROJECT fv3-jedi GIT "https://github.com/jcsda-internal/fv3-jedi.git" BRANCH feature/ufs_clem_update ) # updated from develop on jan28
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be updated to feature/ufs_dom once fv3-jedi PR is merged

@climbfuji
Copy link
Collaborator

Testing this now!

shlyaeva
shlyaeva previously approved these changes Apr 17, 2023
Copy link
Collaborator

@shlyaeva shlyaeva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

couldn't test with soca on platform/compiler of choice, approving based on tests with ATM.

@climbfuji
Copy link
Collaborator

This doesn't work for me :-( On my Mac, I get the following error when I run the UFS ctests (warmstart):

1197: At line 47 of file /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
1197: Fortran runtime error: Different CHARACTER lengths (7/1) in array constructor
1197: At line 47 of file /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
1197: Fortran runtime error: Different CHARACTER lengths (7/1) in array constructor
1197: At line 47 of file /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
1197: Fortran runtime error: Different CHARACTER lengths (7/1) in array constructor
1197: At line 47 of file /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
1197: Fortran runtime error: Different CHARACTER lengths (7/1) in array constructor
1197: At line 47 of file /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
1197: Fortran runtime error: Different CHARACTER lengths (7/1) in array constructor
1197: At line 47 of file /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/fv3jedi/Utilities/fv3jedi_constants_mod.f90
1197: Fortran runtime error: Different CHARACTER lengths (7/1) in array constructor
1197: [JCSDA-L-18146:79842] *** Process received signal ***

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We'll need to fix the ufs warmstart error in fv3-jedi code on macOS

@cmgas
Copy link
Contributor Author

cmgas commented Apr 18, 2023

Rebuilding now with latest develops

@climbfuji
Copy link
Collaborator

@cmgas This works now! The only thing that's needed on my macOS is updating the reference value for the ufs warmstart test:

difference between 355.7572273542616 and 356.73198629080974 is 0.97475893654814172, i.e. exceeds 0.035673198629080978 (FAIL)

@cmgas cmgas requested review from climbfuji and shlyaeva April 19, 2023 15:55
@climbfuji
Copy link
Collaborator

Other good news: I was able to build the atmaero configuration on my macOS as well, will try ng-godas next

@cmgas
Copy link
Contributor Author

cmgas commented Apr 19, 2023

@climbfuji When we merge the soca, fv3-jedi and fv3-jedi-data I will update the ufs-bundle PR

@climbfuji
Copy link
Collaborator

Would be nice to have a list of all PRs that this PR is waiting on in the description ...

@climbfuji
Copy link
Collaborator

Hmm, bad news at last. S2S compile failed on my macOS with:

[ 90%] Built target fv3jedi_addincrement.x
/Applications/Xcode.app/Contents/Developer/usr/bin/make  -f fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/build.make fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/depend
cd /Users/heinzell/scratch/ufs-bundle/build-debug-s2s && /usr/local/Cellar/cmake/3.23.1/bin/cmake -E cmake_depends "Unix Makefiles" /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13 /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/mains /Users/heinzell/scratch/ufs-bundle/build-debug-s2s /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/fv3-jedi/src/mains /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/DependInfo.cmake --color=
/Applications/Xcode.app/Contents/Developer/usr/bin/make  -f fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/build.make fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/build
cd /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/etc && /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/bin/fv3jedi_addincrement.x --output-json-schema=fv3jedi_addincrement.x.schema.json
dyld[72844]: Library not loaded: libpiof.dylib
  Referenced from: /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/bin/fv3jedi_addincrement.x
  Reason: tried: 'libpiof.dylib' (no such file), '/usr/local/lib/libpiof.dylib' (no such file), '/usr/lib/libpiof.dylib' (no such file), '/Users/heinzell/scratch/ufs-bundle/build-debug-s2s/etc/libpiof.dylib' (no such file), '/usr/local/lib/libpiof.dylib' (no such file), '/usr/lib/libpiof.dylib' (no such file)
/bin/sh: line 1: 72844 Abort trap: 6           /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/bin/fv3jedi_addincrement.x --output-json-schema=fv3jedi_addincrement.x.schema.json
make[2]: *** [fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json] Error 134
make[1]: *** [fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/all] Error 2
make: *** [all] Error 2

This works with the current ufs-bundle develop.

@climbfuji
Copy link
Collaborator

Hmm, bad news at last. S2S compile failed on my macOS with:

[ 90%] Built target fv3jedi_addincrement.x
/Applications/Xcode.app/Contents/Developer/usr/bin/make  -f fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/build.make fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/depend
cd /Users/heinzell/scratch/ufs-bundle/build-debug-s2s && /usr/local/Cellar/cmake/3.23.1/bin/cmake -E cmake_depends "Unix Makefiles" /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13 /Users/heinzell/scratch/ufs-bundle/ufs-bundle-clem-apr13/fv3-jedi/src/mains /Users/heinzell/scratch/ufs-bundle/build-debug-s2s /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/fv3-jedi/src/mains /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/DependInfo.cmake --color=
/Applications/Xcode.app/Contents/Developer/usr/bin/make  -f fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/build.make fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/build
cd /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/etc && /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/bin/fv3jedi_addincrement.x --output-json-schema=fv3jedi_addincrement.x.schema.json
dyld[72844]: Library not loaded: libpiof.dylib
  Referenced from: /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/bin/fv3jedi_addincrement.x
  Reason: tried: 'libpiof.dylib' (no such file), '/usr/local/lib/libpiof.dylib' (no such file), '/usr/lib/libpiof.dylib' (no such file), '/Users/heinzell/scratch/ufs-bundle/build-debug-s2s/etc/libpiof.dylib' (no such file), '/usr/local/lib/libpiof.dylib' (no such file), '/usr/lib/libpiof.dylib' (no such file)
/bin/sh: line 1: 72844 Abort trap: 6           /Users/heinzell/scratch/ufs-bundle/build-debug-s2s/bin/fv3jedi_addincrement.x --output-json-schema=fv3jedi_addincrement.x.schema.json
make[2]: *** [fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json] Error 134
make[1]: *** [fv3-jedi/src/mains/CMakeFiles/fv3jedi_addincrement.x.schema.json.dir/all] Error 2
make: *** [all] Error 2

This works with the current ufs-bundle develop.

I believe that this is an error in the parallelio package itself. Not sure why it didn't show up until now. I'll do a bit more digging if we can work around it, but in the meanwhile we should start merging the upstream dependencies of this PR.

@climbfuji
Copy link
Collaborator

The three upstream dependencies have been merged.

shlyaeva
shlyaeva previously approved these changes Apr 20, 2023
@cmgas
Copy link
Contributor Author

cmgas commented Apr 20, 2023

@climbfuji I updated all the branches to be feature/ufs_dom

@climbfuji climbfuji requested a review from shlyaeva April 20, 2023 20:24
Copy link
Collaborator

@shlyaeva shlyaeva left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not retest since the only changes since the last test are in branch names, I expect this to work as it did before. 🎉

@climbfuji climbfuji merged commit a4467b0 into develop Apr 20, 2023
@climbfuji climbfuji deleted the feature/update_apr13 branch April 20, 2023 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants