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

Cleanup of make_bcs tools that generate raster and tile files #763

Merged
merged 19 commits into from
Jul 17, 2023
Merged

Cleanup of make_bcs tools that generate raster and tile files #763

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
934e977
clean up make_bcs
weiyuan-jiang May 30, 2023
0889a48
Merge branch 'develop' into feature/wjiang/clean_up_make_bcs
weiyuan-jiang Jun 7, 2023
de99f87
remove unnecessary check for M03 and M02 of EASEv1
weiyuan-jiang Jun 7, 2023
9be0279
clean ease grid options
biljanaorescanin Jun 14, 2023
de78331
missing stop + remove M01 until ready for users
biljanaorescanin Jun 15, 2023
2e5cbb4
major cleanup of mkEASETilesParam.F90:
gmao-rreichle Jun 17, 2023
bd375d5
fixed minor errors in previous commit
gmao-rreichle Jun 17, 2023
fa5fce3
fixed netcdf error print statements (mkEASETilesParam.F90)
gmao-rreichle Jun 17, 2023
dc438cd
clarified print statements for NF90 status checks; clarified resoluti…
gmao-rreichle Jun 17, 2023
6c3753c
fixed bug introduced in earlier clean-up commit (mkEASETilesParam.F90)
gmao-rreichle Jun 17, 2023
8492415
removed obsolete $THISGRID from make_bcs
gmao-rreichle Jun 18, 2023
a097bf4
fixed bug introduced during earlier clean-up commit; improved error p…
gmao-rreichle Jun 18, 2023
6ce8411
more efficient 1-dim indexing for raster grid; added checks for numbe…
gmao-rreichle Jun 19, 2023
dae09d9
additional cleanup:
gmao-rreichle Jun 19, 2023
212bbbe
fixed old error in comments (mkEASETilesParam.F90)
gmao-rreichle Jun 22, 2023
50b6eb6
Merge branch 'develop' into feature/wjiang/clean_up_make_bcs
gmao-rreichle Jun 26, 2023
7e065c1
remove unnecessary dependency on rmTinyCatchParaMod (mkEASETilesParam…
gmao-rreichle Jun 27, 2023
3fffc8f
added documentation, cleanup, fixed indentation (mkLandRaster.F90)
gmao-rreichle Jun 27, 2023
759f83c
Merge branch 'develop' into feature/wjiang/clean_up_make_bcs
biljanaorescanin Jul 10, 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
2 changes: 1 addition & 1 deletion GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1403,7 +1403,7 @@ if( $grid == ease ) then
set BCNAME = ${EASEVERSION}_${HRCODE}
set BCDIR = $EXPDIR/$OUTDIR/$BCNAME.scratch
set BCJOB = $BCDIR/$BCNAME.j
set THISGRID = ${EASEVERSION}-${HRCODE}
# set THISGRID = ${EASEVERSION}-${HRCODE}

set nfiles = `find $EXPDIR -maxdepth 5 -name ${BCNAME}".j" | wc -l`
if( $nfiles >= 1 ) then
Expand Down
4 changes: 2 additions & 2 deletions ...mp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/make_bcs_questionary.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,8 @@ def ask_questions(default_grid="Cubed-Sphere"):
"name": "EASEv1",
"message": "Select EASEv1 grid resolution: \n ",
"choices": [ \
"M01 -- 1km $34668x14688$", \
"M03 -- 3km $11556x4896$", \
# "M01 -- 1km $34668x14688$", \
# "M03 -- 3km $11556x4896$", \
"M09 -- 9km $3852x1632$", \
"M25 -- 25km $1383x586$", \
"M36 -- 36km $963x408$"],
Expand Down
10 changes: 9 additions & 1 deletion ...dComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/mkEASETilesParam.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,12 +136,20 @@ PROGRAM mkEASETilesParam
gfile = trim(EASElabel)//'_'//trim(nc_string)//'x'//trim(nr_string)

if (index(EASELabel,'M03') /=0) then ! EASE 3 km grid
if (index(EASELabel, 'v1') /=0) then
print*, " EASEv1_M03 is not implemented"
gmao-rreichle marked this conversation as resolved.
Show resolved Hide resolved
stop
endif
regrid = .true.
NC = 21600
NR = 10800
NT = 500000000
endif
if (index(EASELabel,'M03') /=0) then ! EASE 1 km grid
if (index(EASELabel,'M01') /=0) then ! EASE 1 km grid
if (index(EASELabel, 'v1') /=0) then
print*, " EASEv1_M01 is not implemented"
stop
endif
regrid = .true.
NC = 43200
NR = 21600
Expand Down
Loading