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.

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

Remove unused components - fft, station_data, diag_manager/diag_manifest.F90 #199

Merged
merged 21 commits into from
Jan 23, 2020

Conversation

underwoo
Copy link
Member

@underwoo underwoo commented Nov 1, 2019

Removed some components not used in current GFDL models. These include:

  • fft
  • station_data
  • diag_manager/diag_manifest.F90

This PR should only be taken after #181.

underwoo and others added 17 commits October 2, 2019 16:05
Update how configure.ac checks for the netcdf headers and libraries.  This now properly checks for C, C++, Fortran and Fortran 77 headers and APIs.
Adding in the m4 macros that will check for netcdf.  Includes several Fortran specific tests.
Update configure.ac to correctly check for and if needed add options to build libFMS.  This includes cray pointers, netcdf, mpi, long lines, etc.
Fix a few syntax errors in the configure.ac script to correctly handle all configure options

Expand the travis CI tests to test additional options
Fixed how the travis tests are configured
Added the missing compiler flags for the disable-setting-flags build.
Corrected a m4 macro that did not restore the FCFLAGS after running the tests.
Add package config file FMS.pc to be included when libFMS is installed.
Fixed the use of the wrong absolute value function in C sources
The automake build had a circular dependency on mpp_efp.o and the mpp_efp_mod.mod file.  This has been removed.
Removed unused parts of the FMS library.  These include station data
(an early single point regional output) and diag_manifest.F90.
Finshed removing mention of diag_manifest.F90 and its module.
Remove the remainder station_data portions from Makefiles.
Remove fft as it is not used in current GFDL models.
@wrongkindofdoctor wrongkindofdoctor added development enhancement Issue/PR for a modification that increases performance, improves syntax, or adds functionality. labels Nov 6, 2019
@thomas-robinson
Copy link
Member

thomas-robinson commented Nov 6, 2019

@underwoo this pull request does much more than what the description implies. For example, I looked at the travis build with the option --without-openmp and everything is compiled with -fopenmp. Would it make more sense to break this up?

@underwoo
Copy link
Member Author

underwoo commented Nov 6, 2019

@thomas-robinson it does. This PR needs to be taken after #181. I should have said that in the description.

@underwoo
Copy link
Member Author

underwoo commented Nov 6, 2019

Thank you for pointing this out. It appears the make distcheck option does not pass the original configure options options to the distcheck call of configure. From reading the documentation, it looks like setting the variable DISTCHECK_CONFIGURE_FLAGS to the same options that will be passed to configure will resolve the problem. I'll get a PR in to address this.

Note, the first build of FMS does honor the --without-openmp configure option.

@underwoo underwoo added this to the 2020.01 milestone Nov 27, 2019
@underwoo underwoo changed the title Remove.unused.components Remove unused components - fft, station_data, diag_manager/diag_manifest.F90 Jan 6, 2020
@wrongkindofdoctor
Copy link
Contributor

@underwoo I can merge this in as soon as you resolve the merge conflicts.

@thomas-robinson
Copy link
Member

@underwoo I looked at the conflict in diag_manager and it's on line 232/233. You want manually fix this one.

 232        & max_file_attributes, max_axis_attributes, prepend_date, DIAG_FIELD_NOT_FOUND, diag_init_time, diag_data_init,&
 233        & write_manifest_file, fileobj, fileobjU, fnum_for_domain, fileobjND

You removed the write_manifest_file but I added fileobj, fileobjU, fnum_for_domain, fileobjND. Please keep what I added.

Resolve merge conflicts to allow remove.unused.components to be merged into master.
This is to clean up when the template is used.
Changed per suggested use of --with- vs --enable- in configure.
@wrongkindofdoctor wrongkindofdoctor merged commit 497eb37 into NOAA-GFDL:master Jan 23, 2020
@underwoo underwoo deleted the remove.unused.components branch February 13, 2020 19:50
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
development enhancement Issue/PR for a modification that increases performance, improves syntax, or adds functionality.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants