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

Branch dev/emc: convert GFS DDTs from blocked data structures to contiguous arrays #330

Merged
merged 13 commits into from
Aug 8, 2024
Merged

Branch dev/emc: convert GFS DDTs from blocked data structures to contiguous arrays #330

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
38804e4
Update driver/fvGFS/atmosphere.F90: convert GFS_statein and GFS_state…
climbfuji Jan 20, 2024
288f783
Convert GFS_sfcprop DDT to contiguous arrays
climbfuji Feb 22, 2024
bd4697a
Remove GFS_data=IPD_data from driver/fvGFS/atmosphere.F90
climbfuji Feb 27, 2024
90dcfeb
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji Mar 6, 2024
1dd33d4
After update from dev/emc, replace blocked IPD data types with contig…
climbfuji Mar 6, 2024
9aceed1
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji Apr 15, 2024
c0189fa
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji May 13, 2024
85faba5
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji May 22, 2024
a220227
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji Jun 24, 2024
0ec9c9e
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji Jun 27, 2024
54d1b80
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji Jul 12, 2024
65b75fc
Merge branch 'dev/emc' of https://github.com/NOAA-GFDL/GFDL_atmos_cub…
climbfuji Jul 18, 2024
55182e9
Rename driver/fvGFS to driver/UFS and update CMakeLists.txt, docs/Dox…
climbfuji Jul 18, 2024
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
8 changes: 4 additions & 4 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,10 +108,10 @@ list(APPEND tools_srcs_extra
tools/fv_iau_mod.F90)

list(APPEND driver_srcs
driver/fvGFS/DYCORE_typedefs.F90
driver/fvGFS/fv_nggps_diag.F90
driver/fvGFS/fv_ufs_restart_io.F90
driver/fvGFS/atmosphere.F90)
driver/UFS/DYCORE_typedefs.F90
driver/UFS/fv_nggps_diag.F90
driver/UFS/fv_ufs_restart_io.F90
driver/UFS/atmosphere.F90)

list(APPEND fv3_srcs ${model_srcs}
${tools_srcs})
Expand Down
175 changes: 56 additions & 119 deletions docs/Doxyfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,125 +73,62 @@ WARN_IF_DOC_ERROR = YES
WARN_NO_PARAMDOC = NO
WARN_FORMAT = "$file:$line: $text"
WARN_LOGFILE =
<<<<<<< HEAD
INPUT = ./documentation.dox \
./Preface.md \
./Foreword.md \
./Chapter1.md \
./Chapter2.md \
./Chapter3.md \
./Chapter4.md \
./Chapter5.md \
./Chapter6.md \
./Chapter7.md \
./Chapter8.md \
./Chapter9.md \
./appendixA.md \
./appendixB.md \
./appendixB1.md \
./appendixB2.md \
./AdvectionOperators.md \
./OverviewFV3Dycore.md \
./Links.md \
../model/gwdps.f \
../model/a2b_edge.F90 \
../model/boundary.F90 \
../model/dyn_core.F90 \
../model/fv_arrays.F90 \
../model/fv_cmp.F90 \
../model/fv_control.F90 \
../model/fv_dynamics.F90 \
../model/fv_fill.F90 \
../model/fv_grid_utils.F90 \
../model/fv_mapz.F90 \
../model/fv_nesting.F90 \
../model/fv_regional_bc.F90 \
../model/fv_sg.F90 \
../model/fv_tracer2d.F90 \
../model/fv_update_phys.F90 \
../model/multi_gases.F90 \
../model/nh_core.F90 \
../model/nh_utils.F90 \
../model/sw_core.F90 \
../model/tp_core.F90 \
../tools/external_ic.F90 \
../tools/external_sst.F90 \
../tools/fv_diagnostics.F90 \
../tools/fv_eta.F90 \
../tools/fv_grid_tools.F90 \
../tools/fv_iau_mod.F90 \
../tools/fv_io.F90 \
../tools/fv_mp_mod.F90 \
../tools/fv_nudge.F90 \
../tools/fv_restart.F90 \
../tools/fv_surf_map.F90 \
../tools/fv_timing.F90 \
../tools/fv_treat_da_inc.F90 \
../tools/init_hydro.F90 \
../tools/sim_nc_mod.F90 \
../tools/sorted_index.F90 \
../tools/test_cases.F90 \
../driver/fvGFS/atmosphere.F90 \
../driver/fvGFS/DYCORE_typedefs.F90 \
../driver/fvGFS/fv_nggps_diag.F90
=======
INPUT = ./documentation.dox \
./Preface.md \
./Chapter1.md \
./Chapter2.md \
./Chapter3.md \
./Chapter4.md \
./appendixA.md \
./appendixB.md \
./appendixB1.md \
./appendixB2.md \
./AdvectionOperators.md \
./OverviewFV3Dycore.md \
./Links.md \
../model/a2b_edge.F90 \
../model/boundary.F90 \
../model/dyn_core.F90 \
../model/fv_arrays.F90 \
../model/fv_control.F90 \
../model/fv_dynamics.F90 \
../model/fv_fill.F90 \
../model/fv_grid_utils.F90 \
../model/fv_mapz.F90 \
../model/fv_nesting.F90 \
../model/fv_regional_bc.F90 \
../model/fv_sg.F90 \
../model/fv_tracer2d.F90 \
../model/fv_update_phys.F90 \
../model/multi_gases.F90 \
../model/nh_core.F90 \
../model/nh_utils.F90 \
../model/sw_core.F90 \
../model/tp_core.F90 \
../tools/coarse_grained_diagnostics.F90 \
../tools/coarse_grained_restart_files.F90 \
../tools/coarse_graining.F90 \
../tools/external_ic.F90 \
../tools/external_sst.F90 \
../tools/fv_diag_column.F90 \
../tools/fv_diagnostics.F90 \
../tools/fv_eta.F90 \
../tools/fv_grid_tools.F90 \
../tools/fv_iau_mod.F90 \
../tools/fv_io.F90 \
../tools/fv_mp_mod.F90 \
../tools/fv_nudge.F90 \
../tools/fv_restart.F90 \
../tools/fv_surf_map.F90 \
../tools/fv_timing.F90 \
../tools/fv_treat_da_inc.F90 \
../tools/init_hydro.F90 \
../tools/sim_nc_mod.F90 \
../tools/sorted_index.F90 \
../tools/test_cases.F90 \
../driver/fvGFS/atmosphere.F90 \
../driver/fvGFS/DYCORE_typedefs.F90 \
../driver/fvGFS/fv_nggps_diag.F90
>>>>>>> 6944f421bba37887394ef9552d8b88869f82dd49
INPUT = ./documentation.dox \
./Preface.md \
./Chapter1.md \
./Chapter2.md \
./Chapter3.md \
./Chapter4.md \
./appendixA.md \
./appendixB.md \
./appendixB1.md \
./appendixB2.md \
./AdvectionOperators.md \
./OverviewFV3Dycore.md \
./Links.md \
../model/a2b_edge.F90 \
../model/boundary.F90 \
../model/dyn_core.F90 \
../model/fv_arrays.F90 \
../model/fv_control.F90 \
../model/fv_dynamics.F90 \
../model/fv_fill.F90 \
../model/fv_grid_utils.F90 \
../model/fv_mapz.F90 \
../model/fv_nesting.F90 \
../model/fv_regional_bc.F90 \
../model/fv_sg.F90 \
../model/fv_tracer2d.F90 \
../model/fv_update_phys.F90 \
../model/multi_gases.F90 \
../model/nh_core.F90 \
../model/nh_utils.F90 \
../model/sw_core.F90 \
../model/tp_core.F90 \
../tools/coarse_grained_diagnostics.F90 \
../tools/coarse_grained_restart_files.F90 \
../tools/coarse_graining.F90 \
../tools/external_ic.F90 \
../tools/external_sst.F90 \
../tools/fv_diag_column.F90 \
../tools/fv_diagnostics.F90 \
../tools/fv_eta.F90 \
../tools/fv_grid_tools.F90 \
../tools/fv_iau_mod.F90 \
../tools/fv_io.F90 \
../tools/fv_mp_mod.F90 \
../tools/fv_nudge.F90 \
../tools/fv_restart.F90 \
../tools/fv_surf_map.F90 \
../tools/fv_timing.F90 \
../tools/fv_treat_da_inc.F90 \
../tools/init_hydro.F90 \
../tools/sim_nc_mod.F90 \
../tools/sorted_index.F90 \
../tools/test_cases.F90 \
../driver/UFS/atmosphere.F90 \
../driver/UFS/DYCORE_typedefs.F90 \
../driver/UFS/fv_nggps_diag.F90
INPUT_ENCODING = UTF-8
FILE_PATTERNS =
RECURSIVE = YES
Expand Down
0 driver/fvGFS/DYCORE_typedefs.F90 → driver/UFS/DYCORE_typedefs.F90
View file
Open in desktop
File renamed without changes.
Loading