Merge branch 'develop' of https://github.com/NOAA-EMC/fv3atm into fea…

…ture/gfdlmpv3
NOAA-EMC · Nov 7, 2024 · a7d4c3a · a7d4c3a
2 parents bfeff8f + bd785e5
commit a7d4c3a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 20 deletions.
diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere
diff --git a/ccpp/driver/GFS_diagnostics.F90 b/ccpp/driver/GFS_diagnostics.F90
@@ -998,7 +998,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'sw_upfxc'
     ExtDiag(idx)%desc = 'total sky upward sw flux at toa - GFS radiation'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1010,7 +1010,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'sw_dnfxc'
     ExtDiag(idx)%desc = 'total sky downward sw flux at toa - GFS radiation'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1022,7 +1022,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'sw_upfx0'
     ExtDiag(idx)%desc = 'clear sky upward sw flux at toa - GFS radiation'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1034,7 +1034,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'lw_upfxc'
     ExtDiag(idx)%desc = 'total sky upward lw flux at toa - GFS radiation'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1046,7 +1046,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'lw_upfx0'
     ExtDiag(idx)%desc = 'clear sky upward lw flux at toa - GFS radiation'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1234,7 +1234,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'shtfl_ave'
     ExtDiag(idx)%desc = 'surface sensible heat flux'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%cnvfac = cn_one
     ExtDiag(idx)%time_avg = .TRUE.
@@ -1248,7 +1248,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'lhtfl_ave'
     ExtDiag(idx)%desc = 'surface latent heat flux'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%cnvfac = cn_one
     ExtDiag(idx)%time_avg = .TRUE.
@@ -1306,7 +1306,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'dlwsfc'
     ExtDiag(idx)%desc = 'time accumulated downward lw flux at surface'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1318,7 +1318,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'ulwsfc'
     ExtDiag(idx)%desc = 'time accumulated upward lw flux at surface'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -1399,7 +1399,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'pevpr_ave'
     ExtDiag(idx)%desc = 'averaged potential evaporation rate'
-    ExtDiag(idx)%unit = 'W/M**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%time_avg = .TRUE.
     allocate (ExtDiag(idx)%data(nblks))
@@ -2073,7 +2073,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'dlwsfci'
     ExtDiag(idx)%desc = 'instantaneous sfc downward lw flux'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -2085,7 +2085,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'ulwsfci'
     ExtDiag(idx)%desc = 'instantaneous sfc upward lw flux'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -2097,7 +2097,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'dswsfci'
     ExtDiag(idx)%desc = 'instantaneous sfc downward sw flux'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -2109,7 +2109,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'uswsfci'
     ExtDiag(idx)%desc = 'instantaneous sfc upward sw flux'
-    ExtDiag(idx)%unit = 'w/m**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     ExtDiag(idx)%intpl_method = 'bilinear'
     allocate (ExtDiag(idx)%data(nblks))
@@ -2213,7 +2213,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'pevpr'
     ExtDiag(idx)%desc = 'instantaneous surface potential evaporation'
-    ExtDiag(idx)%unit = 'W/M**2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_phys'
     allocate (ExtDiag(idx)%data(nblks))
     do nb = 1,nblks
@@ -4543,7 +4543,7 @@ subroutine GFS_externaldiag_populate (ExtDiag, Model, Statein, Stateout, Sfcprop
     ExtDiag(idx)%axes = 2
     ExtDiag(idx)%name = 'qrain'
     ExtDiag(idx)%desc = 'nsst sensible heat flux due to rainfall'
-    ExtDiag(idx)%unit = 'w/m2'
+    ExtDiag(idx)%unit = 'W/m**2'
     ExtDiag(idx)%mod_name = 'gfs_sfc'
     allocate (ExtDiag(idx)%data(nblks))
     do nb = 1,nblks

diff --git a/ccpp/framework b/ccpp/framework
diff --git a/io/module_write_netcdf.F90 b/io/module_write_netcdf.F90
@@ -398,14 +398,14 @@ end function nf_set_log_level
             par_access = NF90_COLLECTIVE
             if (rank == 2 .and. ichunk2d(grid_id) > 0 .and. jchunk2d(grid_id) > 0) then
                if (is_cubed_sphere) then
-                  chunksizes = [im, jm, tileCount, 1]
+                  chunksizes = [im, jm, 1, 1]
                else
                   chunksizes = [ichunk2d(grid_id), jchunk2d(grid_id),            1]
                end if
                ncerr = nf90_def_var_chunking(ncid, varids(i), NF90_CHUNKED, chunksizes) ; NC_ERR_STOP(ncerr)
             else if (rank == 3 .and. ichunk3d(grid_id) > 0 .and. jchunk3d(grid_id) > 0 .and. kchunk3d(grid_id) > 0) then
                if (is_cubed_sphere) then
-                  chunksizes = [im, jm, lm, tileCount, 1]
+                  chunksizes = [im, jm, 1, 1, 1]
                else
                   chunksizes = [ichunk3d(grid_id), jchunk3d(grid_id), min(kchunk3d(grid_id),fldlev(i)), 1]
                end if
+10 −10		driver/UFS/fv_nggps_diag.F90
+1 −1		tools/external_ic.F90
+2 −2		tools/fv_diag_column.F90
+16 −16		tools/fv_diagnostics.F90
+8 −8		tools/fv_eta.F90
+7 −7		tools/fv_nudge.F90
+2 −2		tools/test_cases.F90
+3 −2		scripts/mkcap.py
+30 −5		scripts/mkstatic.py
+2 −1		test_prebuild/run_all_tests.sh
+11 −6		test_prebuild/test_blocked_data/main.F90
+5 −5		test_prebuild/test_chunked_data/main.F90
+98 −0		test_prebuild/test_unit_conv/CMakeLists.txt
+16 −0		test_prebuild/test_unit_conv/README.md
+13 −0		test_prebuild/test_unit_conv/ccpp_kinds.F90
+15 −0		test_prebuild/test_unit_conv/ccpp_kinds.meta
+82 −0		test_prebuild/test_unit_conv/ccpp_prebuild_config.py
+22 −0		test_prebuild/test_unit_conv/data.F90
+53 −0		test_prebuild/test_unit_conv/data.meta
+92 −0		test_prebuild/test_unit_conv/main.F90
+13 −0		test_prebuild/test_unit_conv/run_test.sh
+11 −0		test_prebuild/test_unit_conv/suite_unit_conv_suite.xml
+55 −0		test_prebuild/test_unit_conv/unit_conv_scheme_1.F90
+41 −0		test_prebuild/test_unit_conv/unit_conv_scheme_1.meta
+55 −0		test_prebuild/test_unit_conv/unit_conv_scheme_2.F90
+41 −0		test_prebuild/test_unit_conv/unit_conv_scheme_2.meta