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

make_bcs output directory reorg #729

Merged
merged 49 commits into from
May 17, 2023
Merged

make_bcs output directory reorg #729

Show file tree
Hide file tree
Changes from 54 commits
Commits
Show all changes
49 commits
Select commit Hold shift + click to select a range
2e28335
rearrange bcs directories + some cleanup
biljanaorescanin Mar 15, 2023
67d45cd
text edit
biljanaorescanin Mar 20, 2023
d9a2555
change time
biljanaorescanin Mar 20, 2023
b94854e
additional cleanup
biljanaorescanin Mar 20, 2023
924ef20
Merge branch 'feature/borescan_update_legacy_bcs_path' into feature/b…
biljanaorescanin Mar 20, 2023
efa5036
Merge branch 'feature/borescan_update_legacy_bcs_path' into feature/b…
biljanaorescanin Mar 20, 2023
b4141a8
initial merger from feature/wjiang/make_bcs_python
weiyuan-jiang Mar 22, 2023
b3b18cb
Update make_bcs
biljanaorescanin Mar 23, 2023
4b33979
sync with make_bcs job script
weiyuan-jiang Mar 23, 2023
1cc21ba
add comment for ease grid
biljanaorescanin Mar 24, 2023
511e00f
rm "rm OUTDDIR" and re-name some variables in make_ease_bcs.py
weiyuan-jiang Mar 24, 2023
1fc4c2f
typo fix
weiyuan-jiang Mar 24, 2023
1746f84
install py script
weiyuan-jiang Mar 27, 2023
d32cfac
fix some typos and bugs
weiyuan-jiang Mar 27, 2023
1048a93
bug again
weiyuan-jiang Mar 27, 2023
1475946
correct maskfile
weiyuan-jiang Mar 28, 2023
b8d45b6
add env MAKE_BCS_INPUT_DIR
weiyuan-jiang Mar 28, 2023
6d73705
rename package files to make_bcs*.py
weiyuan-jiang Mar 28, 2023
f1a39b6
further cleanup. add "\" for continuation
weiyuan-jiang Mar 28, 2023
4ff52de
rename functions
weiyuan-jiang Mar 28, 2023
1ceed43
better formatting ease
weiyuan-jiang Mar 28, 2023
57837e8
correct out_path
weiyuan-jiang Mar 28, 2023
ffdd154
minor fix on path and print out jobid
weiyuan-jiang Mar 29, 2023
c789d2f
only one grid type. Lat-Lon with O1
weiyuan-jiang Mar 29, 2023
cee6a87
clean up
weiyuan-jiang Mar 29, 2023
8333166
re-arrange questions
weiyuan-jiang Mar 29, 2023
4975a74
remove formatting
weiyuan-jiang Mar 30, 2023
66ca2bf
move logs dir few levels up
biljanaorescanin Mar 30, 2023
f452bfc
move logs dir
weiyuan-jiang Mar 30, 2023
be058cc
Merge branch 'feature/borescan_restructure_bcs' of github.com:GEOS-ES…
weiyuan-jiang Mar 30, 2023
5e4bccd
Merge branch 'feature/borescan_update_legacy_bcs_path' into feature/b…
weiyuan-jiang Mar 30, 2023
d4e5a0c
Merge branch 'feature/borescan_update_legacy_bcs_path' into feature/b…
biljanaorescanin Mar 30, 2023
288c6b6
remove outdir dir
biljanaorescanin Apr 3, 2023
d8ee4c6
outdir multijobs resolution
biljanaorescanin Apr 3, 2023
3d08889
move *.trn file to geometry
biljanaorescanin Apr 7, 2023
e2ca882
fix spelling of questionnaire
gmao-rreichle Apr 13, 2023
ad5838d
fixed path to SMAPL4 legacy bcs
gmao-rreichle Apr 13, 2023
a626f8e
Merge branch 'feature/borescan_update_legacy_bcs_path' into feature/b…
gmao-rreichle Apr 13, 2023
2a13a7d
simplify job script creation
weiyuan-jiang Apr 19, 2023
b6b2b4e
correct file names
weiyuan-jiang Apr 19, 2023
fadd79d
mv mkCatchParams.log to the right location
weiyuan-jiang Apr 21, 2023
6d54d4e
Merge pull request #740 from GEOS-ESM/feature/borescan_restructure_bc…
weiyuan-jiang Apr 24, 2023
394b4cb
Minor edit to comment line in create_README.csh
gmao-rreichle May 3, 2023
1c975c0
bug fixed to change the gridname
weiyuan-jiang May 5, 2023
e967dbb
bug fix. Pass grid_type instaed of gridname
weiyuan-jiang May 5, 2023
4f85f89
Update GEOSagAdd CONFIGURE_DEPENDS for python to GEOSsurface_GridComp…
gmao-rreichle May 8, 2023
62141a6
Merge branch 'develop' into feature/borescan_restructure_bcs
gmao-rreichle May 10, 2023
60a905e
Merge branch 'develop' into feature/borescan_restructure_bcs
sdrabenh May 15, 2023
2caed56
Merge branch 'develop' into feature/borescan_restructure_bcs
sdrabenh May 17, 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: 2 additions & 0 deletions ...cm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,5 @@ ecbuild_add_executable (TARGET mk_runofftbl.x SOURCES mk_runofftbl.F90 LIBS MAPL
ecbuild_add_executable (TARGET mkEASETilesParam.x SOURCES mkEASETilesParam.F90 LIBS MAPL ${this})

install(PROGRAMS make_bcs clsm_plots.pro create_README.csh DESTINATION bin)
file(GLOB MAKE_BCS_PYTHON CONFIGURE_DEPENDS "./make_bcs*.py")
install(PROGRAMS ${MAKE_BCS_PYTHON} DESTINATION bin)
301 changes: 0 additions & 301 deletions ...agcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/bcs_utils.py
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions ...cm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/clsm_plots.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -612,8 +612,6 @@ make_movies, ncat, vec2grid, 'LAI'
make_movies, ncat, vec2grid, 'GREEN'
make_movies, ncat, vec2grid, 'VISDF'
make_movies, ncat, vec2grid, 'NIRDF'
make_movies, ncat, vec2grid, 'MODIS-VIS'
make_movies, ncat, vec2grid, 'MODIS-NIR'

END

Expand Down Expand Up @@ -995,8 +993,6 @@ if (vname eq 'LAI') then filename = '../lai.dat'
if (vname eq 'GREEN') then filename = '../green.dat'
if (vname eq 'VISDF') then filename = '../AlbMap.WS.8-day.tile.0.3_0.7.dat'
if (vname eq 'NIRDF') then filename = '../AlbMap.WS.8-day.tile.0.7_5.0.dat'
if (vname eq 'MODIS-VIS') then filename = '../MODISVISmean.dat'
if (vname eq 'MODIS-NIR') then filename = '../MODISNIRmean.dat'

im = n_elements(vec2grid[*,0].NT)
jm = n_elements(vec2grid[0,*].NT)
Expand Down
3 changes: 2 additions & 1 deletion ...GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/Raster/makebcs/create_README.csh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,8 @@ cat << _EOV1_ > clsm/veg1

3.2.2 vegdyn input data (mosaic primary type, canopy height, and roughness) for GEOS
file name: vegdyn.data or ../vegdyn_*.dat
file format: fortran binaries, little_endian
file format: netCDF4 (starting with [Icarus-]NLv3, released 2019).
All earlier versions are fortran binaries, little_endian:
read ([UNIT]) (primary_veg_type(n),n=1,${NTILES})
read ([UNIT]) (canopy_height (n),n=1,${NTILES})
read ([UNIT]) (ASCATz0 (n),n=1,${NTILES})
Expand Down
Loading