Merge branch 'ufs-community:develop' into bugfix/heraecflow

MinsukJi-NOAA · Jul 26, 2021 · 0fa3999 · 0fa3999
2 parents 0ce35b3 + 98dfa96
commit 0fa3999
Show file tree

Hide file tree

Showing 20 changed files with 1,586 additions and 1,608 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -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 w3nco::w3nco_d bacio::bacio_4)
-
 # Configure Python
 find_package(Python 3 REQUIRED COMPONENTS Interpreter)
 message("Found Python: ${Python_EXECUTABLE}")
@@ -207,7 +202,7 @@ endif()
 ### Data Components [NEMSdatm, CDEPS]
 ###############################################################################
 if(NEMSdatm)
-  add_subdirectory(DATM)
+  add_subdirectory(DATM/DATM)
 endif()
 
 if(CDEPS)

diff --git a/FV3 b/FV3
diff --git a/modulefiles/ufs_common b/modulefiles/ufs_common
@@ -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
 

diff --git a/modulefiles/ufs_common_debug b/modulefiles/ufs_common_debug
@@ -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
diff --git a/tests/RegressionTests_cheyenne.gnu.log b/tests/RegressionTests_cheyenne.gnu.log
diff --git a/tests/RegressionTests_cheyenne.intel.log b/tests/RegressionTests_cheyenne.intel.log
diff --git a/tests/RegressionTests_gaea.intel.log b/tests/RegressionTests_gaea.intel.log
diff --git a/tests/RegressionTests_hera.gnu.log b/tests/RegressionTests_hera.gnu.log
diff --git a/tests/RegressionTests_hera.intel.log b/tests/RegressionTests_hera.intel.log
diff --git a/tests/RegressionTests_jet.intel.log b/tests/RegressionTests_jet.intel.log
diff --git a/tests/RegressionTests_orion.intel.log b/tests/RegressionTests_orion.intel.log
diff --git a/tests/RegressionTests_wcoss_cray.log b/tests/RegressionTests_wcoss_cray.log
diff --git a/tests/RegressionTests_wcoss_dell_p3.log b/tests/RegressionTests_wcoss_dell_p3.log
diff --git a/tests/default_vars.sh b/tests/default_vars.sh
@@ -436,8 +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
 

diff --git a/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN b/tests/parm/esg_HAFS_v0_hwrf-model_configure.IN
@@ -18,8 +18,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'
 cen_lon:                 -97.5

diff --git a/tests/parm/gsd_sar-model_configure.IN b/tests/parm/gsd_sar-model_configure.IN
@@ -17,7 +17,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'

diff --git a/tests/parm/model_configure.IN b/tests/parm/model_configure.IN
@@ -25,8 +25,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]
 

diff --git a/tests/parm/model_configure_hafs.IN b/tests/parm/model_configure_hafs.IN
@@ -19,8 +19,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'
 # imo:                     384

diff --git a/tests/parm/model_configure_regional.IN b/tests/parm/model_configure_regional.IN
@@ -26,8 +26,6 @@ jchunk2d:                -1
 ichunk3d:                -1
 jchunk3d:                -1
 kchunk3d:                -1
-write_nemsioflip:        .false.
-write_fsyncflag:         .false.
 
 # output_grid:             'gaussian_grid'
 # imo:                     384

diff --git a/tests/parm/stretched-nest-quilt-model_configure.IN b/tests/parm/stretched-nest-quilt-model_configure.IN
@@ -18,8 +18,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'
 # lon1:                    225.0
+1 −5		CMakeLists.txt
+1 −1		ccpp/CMakeLists.txt
+0 −46		io/ffsync.F90
+0 −2		io/module_fv3_io_def.F90
+0 −1		io/module_write_internal_state.F90
+0 −795		io/module_write_nemsio.F90
+14 −69		io/module_wrt_grid_comp.F90