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

Remove nemsio dependency #685

Merged
merged 18 commits into from
Jul 26, 2021
Merged

Remove nemsio dependency #685

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
706bdbe
Update FV3 submodule
DusanJovic-NOAA Jul 9, 2021
5ed2860
Remove nemsio
DusanJovic-NOAA Jul 9, 2021
6ce63f0
Build only DATM subdirectory in DATM
DusanJovic-NOAA Jul 9, 2021
264525a
Remove write_fsyncflag
DusanJovic-NOAA Jul 12, 2021
ee87e52
Merge remote-tracking branch 'origin/develop' into remove_nemsio
DusanJovic-NOAA Jul 22, 2021
4323079
Update FV3
DusanJovic-NOAA Jul 22, 2021
6af9b60
Merge remote-tracking branch 'origin/develop' into remove_nemsio
DusanJovic-NOAA Jul 22, 2021
12c5303
Merge remote-tracking branch 'origin/develop' into remove_nemsio
DusanJovic-NOAA Jul 23, 2021
6da3d85
RT JOBS PASSED: cheyenne.gnu. Log file uploaded.
BrianCurtis-NOAA Jul 23, 2021
45decd9
RT JOBS PASSED: orion.intel. Log file uploaded.
BrianCurtis-NOAA Jul 23, 2021
60c4081
Add RegressionTests_hera.gnu.log and RegressionTests_hera.intel.log
DusanJovic-NOAA Jul 23, 2021
aec6c7b
Merge branch 'remove_nemsio' of https://github.com/DusanJovic-NOAA/uf…
DusanJovic-NOAA Jul 23, 2021
2f9c0bd
RT JOBS PASSED: gaea.intel. Log file uploaded.
BrianCurtis-NOAA Jul 23, 2021
562d923
RT JOBS PASSED: cheyenne.intel. Log file uploaded.
BrianCurtis-NOAA Jul 23, 2021
9cfce2f
Add RegressionTests_wcoss_cray.log
DusanJovic-NOAA Jul 23, 2021
ce6af51
Add RegressionTests_wcoss_dell_p3.log
DusanJovic-NOAA Jul 23, 2021
51deff3
RT JOBS PASSED: jet.intel. Log file uploaded.
BrianCurtis-NOAA Jul 24, 2021
dee1208
Revert .gitmodules and update FV3
DusanJovic-NOAA Jul 26, 2021
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
6 changes: 4 additions & 2 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
[submodule "FV3"]
path = FV3
url = https://github.com/NOAA-EMC/fv3atm
branch = develop
#url = https://github.com/NOAA-EMC/fv3atm
#branch = develop
url = https://github.com/DusanJovic-NOAA/fv3atm
branch = remove_nemsio
[submodule "NEMS"]
path = NEMS
url = https://github.com/NOAA-EMC/NEMS
Expand Down
7 changes: 1 addition & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,17 +122,12 @@ if(CMEPS)
endif()

find_package(bacio REQUIRED)
find_package(nemsio REQUIRED)
find_package(sp REQUIRED)
find_package(w3emc REQUIRED)
find_package(w3nco REQUIRED)
if(INLINE_POST)
find_package(upp REQUIRED)
endif()

# See https://github.com/NOAA-EMC/NCEPLIBS-nemsio/pull/22
target_link_libraries(nemsio::nemsio INTERFACE w3emc::w3emc_d bacio::bacio_4)

# Configure Python
find_package(Python 3 REQUIRED COMPONENTS Interpreter)
message("Found Python: ${Python_EXECUTABLE}")
Expand Down Expand Up @@ -207,7 +202,7 @@ endif()
### Data Components [NEMSdatm, CDEPS]
###############################################################################
if(NEMSdatm)
add_subdirectory(DATM)
add_subdirectory(DATM/DATM)
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why do we need this change for removing nemsio?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

add_subdirectory(DATM) adds both DATM and tools which depends on nemsio. ufs-weather-model depends only on DATM/DATM

Copy link
Contributor

Choose a reason for hiding this comment

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

I agree with this change, unless the tools are pulled out, which they should be. The tools should ideally reside in UFS_utils

Copy link
Contributor

Choose a reason for hiding this comment

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

Or NEMS-datm or something like that.

Copy link
Collaborator

@DeniseWorthen DeniseWorthen Jul 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

I don't believe that what is currently in the tools subdirectory is used at all. It is the original code I wrote to convert nesmio to netcdf for the DATM.

The code which is currently used to generate the DATM files resides in the utilities subdirectory of the DATM-MOM6-CICE6 repo. That also contains the utility to create the SCRIP file for the DATM (gen_scrip) although I'm not 100% sure it is used for CDEPS. It is the utilities subdirectory which would need to get moved to ufs-utils.

Copy link
Collaborator

@junwang-noaa junwang-noaa Jul 12, 2021 •
edited
Loading

Choose a reason for hiding this comment

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

@binli2337 @DeniseWorthen can we remove tools directory under https://github.com/noaa-emc/nemsdatm to avoid confusion?

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, I believe we can & should remove the tools subdirectory.

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes.

endif()

if(CDEPS)
Expand Down
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated 5 files
+1 −4 CMakeLists.txt
+0 −1 io/module_fv3_io_def.F90
+0 −1 io/module_write_internal_state.F90
+0 −795 io/module_write_nemsio.F90
+14 −66 io/module_wrt_grid_comp.F90
2 changes: 0 additions & 2 deletions modulefiles/ufs_common
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,7 @@ module load crtm/2.3.0
module load g2/3.4.2
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.8

Expand Down
4 changes: 1 addition & 3 deletions modulefiles/ufs_common_debug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,10 @@ module load crtm/2.3.0
module load g2/3.4.2
module load g2tmpl/1.10.0
module load ip/3.3.3
module load nemsio/2.5.2
module load sp/2.3.3
module load w3emc/2.7.3
module load w3nco/2.4.1
module load upp/10.0.8

module load gftl-shared/v1.3.0
module load yafyaml/v0.5.1
module load mapl/v2.7.3
module load mapl/v2.7.3
1 change: 0 additions & 1 deletion tests/default_vars.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,6 @@ export OUTPUT_GRID="'cubed_sphere_grid'"
export OUTPUT_FILE="'netcdf'"
export IDEFLATE=0
export NBITS=0
export WRITE_NEMSIOFLIP=.false.
export WRITE_FSYNCFLAG=.false.
export IMO=384
export JMO=190
Expand Down
1 change: 0 additions & 1 deletion tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ write_tasks_per_group: 40
num_files: 2
filename_base: 'dyn''phy'
output_file: 'netcdf'
write_nemsioflip: .false.
write_fsyncflag: .false.

output_grid: 'lambert_conformal'
Expand Down
1 change: 0 additions & 1 deletion tests/parm/gsd_sar-model_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ write_tasks_per_group: 4
num_files: 2
filename_base: 'dyn''phy'
output_file: 'netcdf'
write_nemsioflip: .false.
write_fsyncflag: .false.

output_grid: 'lambert_conformal'
Expand Down
1 change: 0 additions & 1 deletion tests/parm/model_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ output_grid: @[OUTPUT_GRID]
output_file: @[OUTPUT_FILE]
ideflate: @[IDEFLATE]
nbits: @[NBITS]
write_nemsioflip: @[WRITE_NEMSIOFLIP]
write_fsyncflag: @[WRITE_FSYNCFLAG]
imo: @[IMO]
jmo: @[JMO]
Expand Down
1 change: 0 additions & 1 deletion tests/parm/model_configure_hafs.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ write_dopost: @[WRITE_DOPOST]
num_files: 2
filename_base: 'dyn' 'phy'
output_file: 'netcdf'
write_nemsioflip: .false.
write_fsyncflag: .false.

# output_grid: 'gaussian_grid'
Expand Down
1 change: 0 additions & 1 deletion tests/parm/model_configure_regional.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ jchunk2d: -1
ichunk3d: -1
jchunk3d: -1
kchunk3d: -1
write_nemsioflip: .false.
write_fsyncflag: .false.

# output_grid: 'gaussian_grid'
Expand Down
1 change: 0 additions & 1 deletion tests/parm/stretched-nest-quilt-model_configure.IN
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ write_tasks_per_group: 4
num_files: 2
filename_base: 'dyn' 'phy'
output_file: 'netcdf'
write_nemsioflip: .false.
write_fsyncflag: .false.

# output_grid: 'regional_latlon'
Expand Down