From 2ac19b04a951115c6f2b43c90035ddf747871cfa Mon Sep 17 00:00:00 2001 From: Yury Vikhliaev Date: Thu, 2 Mar 2023 14:57:35 -0500 Subject: [PATCH 1/3] make_bcs modified to add a new 0.66 degree MOM6 grid --- .../GEOSsurface_GridComp/Utils/Raster/make_bcs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs index 8d6d0b50f..84e8cd79b 100755 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs @@ -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 )" + echo " ${C2}T3MOM6 -- High-Resolution Tripolar 1/2 deg${CR} (MOM6-Tripolar-Ocean: 580x458 )" 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 " " @@ -337,6 +338,7 @@ ORSLV: $orslv != 'T4' & \ $orslv != 'T1MOM6' & \ $orslv != 'T2MOM6' & \ + $orslv != 'T3MOM6' & \ $orslv != 'T4MOM6' & \ $orslv != 'CS') then echo " ${C1} Invalid choice. Note that entries are case-sensitive. Try again:${CR}" @@ -427,7 +429,7 @@ 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 # ------------------------------------------------------------------------------------------------- @@ -509,6 +511,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 @@ -525,7 +531,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 @@ -817,6 +823,8 @@ ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/360x200 data/MOM ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/720x410 data/MOM5/720x410 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/1440x1080 data/MOM5/1440x1080 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/72x36 data/MOM6/72x36 +ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/360x210 data/MOM6/360x210 +ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/540x458 data/MOM6/540x458 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/1440x1080 data/MOM6/1440x1080 cd data @@ -995,6 +1003,8 @@ ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/360x200 data/MOM ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/720x410 data/MOM5/720x410 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/1440x1080 data/MOM5/1440x1080 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/72x36 data/MOM6/72x36 +ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/360x210 data/MOM6/360x210 +ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/540x458 data/MOM6/540x458 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/1440x1080 data/MOM6/1440x1080 cd data @@ -1181,6 +1191,8 @@ ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/360x200 data/MOM ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/720x410 data/MOM5/720x410 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM5/1440x1080 data/MOM5/1440x1080 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/72x36 data/MOM6/72x36 +ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/360x210 data/MOM6/360x210 +ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/540x458 data/MOM6/540x458 ln -s /discover/nobackup/projects/gmao/ssd/aogcm/ocean_bcs/MOM6/1440x1080 data/MOM6/1440x1080 cd data From aee586c15dadea72e25b67fd3519d60867ebcb9b Mon Sep 17 00:00:00 2001 From: Yury Vikhliaev Date: Mon, 6 Mar 2023 12:16:27 -0500 Subject: [PATCH 2/3] 360x210 MOM6 removed from make_bcs. Fixed prompt for ocean model. --- .../Utils/Raster/make_bcs | 31 +++++++------------ 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs index a43138fe8..d4378c80c 100755 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/make_bcs @@ -302,16 +302,15 @@ if ($isEASE > 0) then else echo "Options for ocean horizontal resolution:" echo " " - echo " ${C2}O1 -- Low-Resolution Reynolds 1 deg${CR} (Lon/Lat Data-Ocean: 360x180 )" - echo " ${C2}O2 -- Med-Resolution Reynolds 1/4 deg${CR} (Lon/Lat Data-Ocean: 1440x720 )" - echo " ${C2}O3 -- High-Resolution OSTIA 1/8 deg${CR} (Lon/Lat Data-Ocean: 2880x1440)" - echo " ${C2}T2 -- Med-Resolution Tripolar 1 deg${CR} (MOM-Tripolar-Ocean: 360x200 )" - 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}T3MOM6 -- High-Resolution Tripolar 1/2 deg${CR} (MOM6-Tripolar-Ocean: 580x458 )" - echo " ${C2}T4MOM6 -- High-Resolution Tripolar 1/4 deg${CR} (MOM6-Tripolar-Ocean: 1440x1080)" + echo " ${C2}O1 -- Reynolds ${CR} (Lon/Lat Data-Ocean: 360x180 )" + echo " ${C2}O2 -- Reynolds ${CR} (Lon/Lat Data-Ocean: 1440x720 )" + echo " ${C2}O3 -- OSTIA ${CR} (Lon/Lat Data-Ocean: 2880x1440)" + echo " ${C2}T2 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 360x200 )" + echo " ${C2}T3 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 720x410 )" + echo " ${C2}T4 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 1440x1080)" + echo " ${C2}T1MOM6 -- Tripolar ${CR} (MOM6-Tripolar-Ocean: 72x36 )" + echo " ${C2}T3MOM6 -- Tripolar ${CR} (MOM6-Tripolar-Ocean: 580x458 )" + echo " ${C2}T4MOM6 -- Tripolar ${CR} (MOM6-Tripolar-Ocean: 1440x1080)" echo " ${C2}CS -- Cubed-Sphere Ocean ${CR} (Cubed-Sphere Data-Ocean )" echo " " @@ -337,7 +336,6 @@ ORSLV: $orslv != 'T3' & \ $orslv != 'T4' & \ $orslv != 'T1MOM6' & \ - $orslv != 'T2MOM6' & \ $orslv != 'T3MOM6' & \ $orslv != 'T4MOM6' & \ $orslv != 'CS') then @@ -428,7 +426,7 @@ else endif if ( $orslv == O1 | $orslv == T2 | $orslv == T3 | $orslv == T4 | \ - $orslv == T1MOM6 | $orslv == T2MOM6 | $orslv == T3MOM6 | $orslv == T4MOM6 ) then + $orslv == T1MOM6 | $orslv == T3MOM6 | $orslv == T4MOM6 ) then # Great-Lakes & Caspian-Sea treated as Model LAKE tiles, Surface Temperatures will be Model Derived # ------------------------------------------------------------------------------------------------- @@ -506,10 +504,6 @@ if( $orslv == T1MOM6 ) then @ imo = 72 # MOM6 Tripolar-Ocean @ jmo = 36 # MOM6 Tripolar-Ocean endif -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 @@ -530,7 +524,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 == T3MOM6 | $orslv == T4MOM6 ) then +else if ( $orslv == T1MOM6 | $orslv == T3MOM6 | $orslv == T4MOM6 ) then set TRIPOL_OCEAN = TRUE set MOM_VERSION = MOM6 set DATENAME = TM @@ -822,7 +816,6 @@ 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 @@ -1002,7 +995,6 @@ 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 @@ -1191,7 +1183,6 @@ 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 From e4aa8dcd2751453c18d7553765c9b08a745861bf Mon Sep 17 00:00:00 2001 From: Rolf Reichle Date: Mon, 6 Mar 2023 14:36:28 -0500 Subject: [PATCH 3/3] very minor MOM5/6 cleanup (MOM_VERSION init, comments, whitespace) --- .../Utils/Raster/makebcs/make_bcs | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs index d4378c80c..6a582db3b 100755 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs @@ -305,9 +305,9 @@ else echo " ${C2}O1 -- Reynolds ${CR} (Lon/Lat Data-Ocean: 360x180 )" echo " ${C2}O2 -- Reynolds ${CR} (Lon/Lat Data-Ocean: 1440x720 )" echo " ${C2}O3 -- OSTIA ${CR} (Lon/Lat Data-Ocean: 2880x1440)" - echo " ${C2}T2 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 360x200 )" - echo " ${C2}T3 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 720x410 )" - echo " ${C2}T4 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 1440x1080)" + echo " ${C2}T2 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 360x200 )" + echo " ${C2}T3 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 720x410 )" + echo " ${C2}T4 -- Tripolar ${CR} (MOM5-Tripolar-Ocean: 1440x1080)" echo " ${C2}T1MOM6 -- Tripolar ${CR} (MOM6-Tripolar-Ocean: 72x36 )" echo " ${C2}T3MOM6 -- Tripolar ${CR} (MOM6-Tripolar-Ocean: 580x458 )" echo " ${C2}T4MOM6 -- Tripolar ${CR} (MOM6-Tripolar-Ocean: 1440x1080)" @@ -489,28 +489,28 @@ if( $orslv == O3 ) then @ jmo = 1440 # Lat/Lon Data-Ocean (OSTIA 1/8-deg) endif if( $orslv == T2 ) then - @ imo = 360 # MOM Tripolar-Ocean - @ jmo = 200 # MOM Tripolar-Ocean + @ imo = 360 # MOM5 Tripolar-Ocean + @ jmo = 200 # MOM5 Tripolar-Ocean endif if( $orslv == T3 ) then - @ imo = 720 # MOM Tripolar-Ocean - @ jmo = 410 # MOM Tripolar-Ocean + @ imo = 720 # MOM5 Tripolar-Ocean + @ jmo = 410 # MOM5 Tripolar-Ocean endif if( $orslv == T4 ) then - @ imo = 1440 # MOM Tripolar-Ocean - @ jmo = 1080 # MOM Tripolar-Ocean + @ imo = 1440 # MOM5 Tripolar-Ocean + @ jmo = 1080 # MOM5 Tripolar-Ocean endif if( $orslv == T1MOM6 ) then - @ imo = 72 # MOM6 Tripolar-Ocean - @ jmo = 36 # MOM6 Tripolar-Ocean + @ imo = 72 # MOM6 Tripolar-Ocean + @ jmo = 36 # MOM6 Tripolar-Ocean endif if( $orslv == T3MOM6 ) then - @ imo = 540 # MOM6 Tripolar-Ocean - @ jmo = 458 # MOM6 Tripolar-Ocean + @ 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 + @ imo = 1440 # MOM6 Tripolar-Ocean + @ jmo = 1080 # MOM6 Tripolar-Ocean endif if( $orslv == O1 | $orslv == O2| $orslv == O3 ) then @@ -518,7 +518,7 @@ if( $orslv == O1 | $orslv == O2| $orslv == O3 ) then set DATENAME = DE set POLENAME = PE endif -set MOM_VERSION = MOM5 +set MOM_VERSION = UNDEF if( $orslv == T2 | $orslv == T3 | $orslv == T4 ) then set TRIPOL_OCEAN = TRUE set MOM_VERSION = MOM5