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.

Sign up for GitHub

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

Jump to bottom

Add new 0.66 degree MOM6 grid into make_bcs #712

Merged
merged 9 commits into from
Mar 6, 2023
Merged

Add new 0.66 degree MOM6 grid into make_bcs #712

Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7398a3d
Merge pull request #690 from GEOS-ESM/develop
sdrabenh Dec 16, 2022
377221d
Merge pull request #698 from GEOS-ESM/develop
sdrabenh Jan 17, 2023
2ac19b0
make_bcs modified to add a new 0.66 degree MOM6 grid
Mar 2, 2023
077bb4d
Merge branch 'develop' into yv/feature/mom6-0.66deg
Mar 2, 2023
5b03ac9
Merge branch 'develop' into yv/feature/mom6-0.66deg
sdrabenh Mar 6, 2023
aee586c
360x210 MOM6 removed from make_bcs. Fixed prompt for ocean model.
Mar 6, 2023
69d1e8d
Merge branch 'yv/feature/mom6-0.66deg' of github.com:GEOS-ESM/GEOSgcm…
Mar 6, 2023
19d12f8
Merge branch 'develop' into yv/feature/mom6-0.66deg
gmao-rreichle Mar 6, 2023
e4aa8dc
very minor MOM5/6 cleanup (MOM_VERSION init, comments, whitespace)
gmao-rreichle Mar 6, 2023
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
22 changes: 19 additions & 3 deletions GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -309,7 +309,8 @@ else
echo " ${C2}T3 -- High-Resolution Tripolar 1/2 deg${CR} (MOM-Tripolar-Ocean: 720x410 )"
echo " ${C2}T4 -- High-Resolution Tripolar 1/4 deg${CR} (MOM-Tripolar-Ocean: 1440x1080)"
echo " ${C2}T1MOM6 -- Low-Resolution Tripolar 5 deg${CR} (MOM6-Tripolar-Ocean: 72x36 )"
# echo " ${C2}T2MOM6 -- Med-Resolution Tripolar 1 deg${CR} (MOM6-Tripolar-Ocean: 360x210 )"
echo " ${C2}T2MOM6 -- Med-Resolution Tripolar 1 deg${CR} (MOM6-Tripolar-Ocean: 360x210 )"
yvikhlya marked this conversation as resolved.
Show resolved Hide resolved
echo " ${C2}T3MOM6 -- High-Resolution Tripolar 1/2 deg${CR} (MOM6-Tripolar-Ocean: 580x458 )"
yvikhlya marked this conversation as resolved.
Show resolved Hide resolved
echo " ${C2}T4MOM6 -- High-Resolution Tripolar 1/4 deg${CR} (MOM6-Tripolar-Ocean: 1440x1080)"
echo " ${C2}CS -- Cubed-Sphere Ocean ${CR} (Cubed-Sphere Data-Ocean )"
echo " "
Expand Down Expand Up @@ -337,6 +338,7 @@ ORSLV:
$orslv != 'T4' & \
$orslv != 'T1MOM6' & \
$orslv != 'T2MOM6' & \
yvikhlya marked this conversation as resolved.
Show resolved Hide resolved
$orslv != 'T3MOM6' & \
$orslv != 'T4MOM6' & \
$orslv != 'CS') then
echo " ${C1} Invalid choice. Note that entries are case-sensitive. Try again:${CR}"
Expand Down Expand Up @@ -426,7 +428,7 @@ else
endif

if ( $orslv == O1 | $orslv == T2 | $orslv == T3 | $orslv == T4 | \
$orslv == T1MOM6 | $orslv == T2MOM6 | $orslv == T4MOM6 ) then
$orslv == T1MOM6 | $orslv == T2MOM6 | $orslv == T3MOM6 | $orslv == T4MOM6 ) then

# Great-Lakes & Caspian-Sea treated as Model LAKE tiles, Surface Temperatures will be Model Derived
# -------------------------------------------------------------------------------------------------
Expand Down Expand Up @@ -508,6 +510,10 @@ if( $orslv == T2MOM6 ) then
@ imo = 360 # MOM6 Tripolar-Ocean
@ jmo = 210 # MOM6 Tripolar-Ocean
endif
if( $orslv == T3MOM6 ) then
@ imo = 540 # MOM6 Tripolar-Ocean
@ jmo = 458 # MOM6 Tripolar-Ocean
endif
if( $orslv == T4MOM6 ) then
@ imo = 1440 # MOM6 Tripolar-Ocean
@ jmo = 1080 # MOM6 Tripolar-Ocean
Expand All @@ -524,7 +530,7 @@ if( $orslv == T2 | $orslv == T3 | $orslv == T4 ) then
set MOM_VERSION = MOM5
set DATENAME = TM
set POLENAME = TM
else if ( $orslv == T1MOM6 | $orslv == T2MOM6 | $orslv == T4MOM6 ) then
else if ( $orslv == T1MOM6 | $orslv == T2MOM6 | $orslv == T3MOM6 | $orslv == T4MOM6 ) then
set TRIPOL_OCEAN = TRUE
set MOM_VERSION = MOM6
set DATENAME = TM
Expand Down Expand Up @@ -811,10 +817,13 @@ cd $BCDIR
/bin/ln -s $bin_dir
source bin/g5_modules
mkdir -p til rst data/MOM5 data/MOM6 clsm/plots

ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/360x200 data/MOM5/360x200
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/720x410 data/MOM5/720x410
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/1440x1080 data/MOM5/1440x1080
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/72x36 data/MOM6/72x36
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/360x210 data/MOM6/360x210
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/540x458 data/MOM6/540x458
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/1440x1080 data/MOM6/1440x1080

cd data
Expand Down Expand Up @@ -988,12 +997,16 @@ cd $BCDIR
/bin/ln -s $bin_dir
source bin/g5_modules
mkdir -p til rst data/MOM5 data/MOM6 clsm/plots

ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/360x200 data/MOM5/360x200
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/720x410 data/MOM5/720x410
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/1440x1080 data/MOM5/1440x1080
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/72x36 data/MOM6/72x36
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/360x210 data/MOM6/360x210
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/540x458 data/MOM6/540x458
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/1440x1080 data/MOM6/1440x1080


cd data
cd ../

Expand Down Expand Up @@ -1173,10 +1186,13 @@ cd $BCDIR
/bin/ln -s $bin_dir
source bin/g5_modules
mkdir -p til rst data/MOM5 data/MOM6 clsm/plots

ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/360x200 data/MOM5/360x200
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/720x410 data/MOM5/720x410
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM5/1440x1080 data/MOM5/1440x1080
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/72x36 data/MOM6/72x36
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/360x210 data/MOM6/360x210
Copy link
Contributor

Choose a reason for hiding this comment

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

#712 (comment)

@sdrabenh, I suspect reason for failure(s) is that it cannot read there new files. Right @mathomp4 ?

Copy link
Contributor

Choose a reason for hiding this comment

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

Now, I intend to check it all myself. I have queued it, but have no ETA when I'll get to it.

Copy link
Collaborator

Choose a reason for hiding this comment

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

@sanAkel sorry just saw your comment. That is what I suspect

Copy link
Contributor

Choose a reason for hiding this comment

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

Boundary Conditions package would have failed @sanAkel if files weren't there.
So files were at location when I was running and are still there.

Copy link
Member

Choose a reason for hiding this comment

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

@sanAkel @sdrabenh I don't think it's that. It's dying in run so it gets through the scripting.

My first guess is that the CI does a checkout-if-exists step and so it's not just picking up this branch but also the yv/feature/mom6-0.66deg in GEOS_OceanGridComp as seen in GEOS-ESM/GEOS_OceanGridComp#21

That PR from @yvikhlya is based on develop in the Ocean GC repo and in there line 653 (which is where the model is dying) is crapping out on:

       call MAPL_GetPointer(EXPORT, T_Freeze_e, 'T_Freeze', _RC)

If that line requires, say, a new mom6 tag or something, it's possible the CI is just "unhappy" until the latest Ocean/MOM6 combo is brought into GEOSgcm fixture itself.

So this might be a case of we have to superpower merge it in because of CI issues.

Copy link
Member

Choose a reason for hiding this comment

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

@sanAkel It's just really a consequence of the CI scripting trying to be smart. This seems "safe" to pull in because, as @gmao-rreichle says below, it's touching a script my CI does not care about. But the yv/feature/mom6-0.66deg branch in Ocean GC doesn't quite run without some change elsewhere.

If you, @sdrabenh, @biljanaorescanin, and @gmao-rreichle are fine with this, I can power it in with admin powers.

Copy link
Author

Choose a reason for hiding this comment

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

But the yv/feature/mom6-0.66deg branch in Ocean GC doesn't quite run without some change elsewhere.

It touches only several configs. How can this affect the build?

Copy link
Contributor

Choose a reason for hiding this comment

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

If you, @sdrabenh, @biljanaorescanin, and @gmao-rreichle are fine with this, I can power it in with admin powers.

I'm generally ok with the changes but we MUST coordinate this PR with #707. At this moment, #707 is ready, and I assume @sdrabenh will merge it first. Then we have to modify this PR in response. So please refrain from using superpowers unless we have this sorted, so we're not inadvertently merging a conflicting set of PRs.

Copy link
Contributor

@sanAkel sanAkel Mar 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

I go with @gmao-rreichle - his word be the final one!

Copy link
Contributor

Choose a reason for hiding this comment

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

If you, @sdrabenh, @biljanaorescanin, and @gmao-rreichle are fine with this, I can power it in with admin powers.

I'm generally ok with the changes but we MUST coordinate this PR with #707. At this moment, #707 is ready, and I assume @sdrabenh will merge it first. Then we have to modify this PR in response. So please refrain from using superpowers unless we have this sorted, so we're not inadvertently merging a conflicting set of PRs.

@gmao-rreichle Please put a DNA label

ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/540x458 data/MOM6/540x458
ln -s $MAKE_BCS_INPUT_DIR/ocean/MOM6/1440x1080 data/MOM6/1440x1080

cd data
Expand Down