Skip to content

Commit

Permalink
Merge pull request #593 from NCAR/quickbuild_tests
Browse files Browse the repository at this point in the history
Quickbuild tests
  • Loading branch information
hkershaw-brown authored Dec 13, 2023
2 parents 74b4221 + 54a374d commit 99ebec5
Show file tree
Hide file tree
Showing 26 changed files with 206 additions and 344 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,19 @@ individual files.

The changes are now listed with the most recent at the top.

**December 13 2023 :: Developer tests and bug fixes. Tag v10.10.0**

- new developer tests to run all builds for all compilers on NSF NCAR machine
Derecho.
- removed redundant nc_check routine from utilities_mod in favor of
netcdf_utilities_mod::nc_check
- Improved default thinning options for AIRS L2 converter.

bug-fixes:

- AIRS L2 converter message prints correct number of obs.
- MOM6 model_mod .eqv. used for logical comparison to conform to Fortran standard.

**December 1 2023 :: Bringing DART documentation in accordance with NSF Policy. Tag v10.9.2**

- doc-fixes:
Expand Down
34 changes: 0 additions & 34 deletions assimilation_code/modules/utilities/utilities_mod.f90
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ module utilities_mod
error_handler, &
to_upper, &
squeeze_out_blanks, &
nc_check, & ! remove this; moved to netcdf_utils
next_file, & ! deprecate this
logfileunit, &
nmlfileunit, &
Expand Down Expand Up @@ -1321,39 +1320,6 @@ subroutine set_tasknum (tasknum)

end subroutine set_tasknum

!-----------------------------------------------------------------------

!>@todo FIXME: remove this once all other code is calling
!>this from the netcdf_utilities_mod instead.

subroutine nc_check(istatus, subr_name, context)

use netcdf

integer, intent (in) :: istatus
character(len=*), intent(in) :: subr_name
character(len=*), intent(in), optional :: context

! if no error, nothing to do here. we are done.
if(istatus == nf90_noerr) return


! something wrong. construct an error string and call the handler.

! context is optional, but is very useful if specified.
! if context + error code > 512, the assignment will truncate.
if (present(context) ) then
msgstring1 = trim(context) // ': ' // trim(nf90_strerror(istatus))
else
msgstring1 = nf90_strerror(istatus)
endif

! this does not return
call error_handler(E_ERR, 'nc_check', msgstring1, source, text2=subr_name)

end subroutine nc_check


!-----------------------------------------------------------------------
!> convert a string to upper case *in place*

Expand Down
4 changes: 2 additions & 2 deletions assimilation_code/programs/compute_error/compute_error.f90
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ program compute_error

use utilities_mod, only : initialize_utilities, &
error_handler, nmlfileunit, E_MSG, E_ERR, &
find_namelist_in_file, nc_check, &
find_namelist_in_file, &
check_namelist_read, finalize_utilities, &
do_nml_file, do_nml_term

use netcdf_utilities_mod, only : nc_check
use netcdf

implicit none
Expand Down
25 changes: 25 additions & 0 deletions build_templates/mkmf.template.ifx.linux
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# DART software - Copyright UCAR. This open source software is provided
# by UCAR, "as is", without charge, subject to all terms of use at
# http://www.image.ucar.edu/DAReS/DART/DART_download
#

MPIFC = mpif90
MPILD = mpif90
FC = ifx
LD = ifx

# If your NETCDF environment variable is not set correctly,
# uncomment the following line and set value to where lib and include
# are found for the netcdf files that match this compiler.
#
# NETCDF = /opt/local

INCS = -I$(NETCDF)/include
LIBS = -L$(NETCDF)/lib -lnetcdff -lnetcdf
FFLAGS = -O -assume buffered_io $(INCS)
LDFLAGS = $(FFLAGS) $(LIBS)

# for development or debugging, use this instead:
# FFLAGS = -g -C -check noarg_temp_created -fpe0 \
# -fp-model precise -ftrapuv -traceback \
# -warn declarations,uncalled,unused $(INCS)
2 changes: 1 addition & 1 deletion conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
author = 'Data Assimilation Research Section'

# The full version, including alpha/beta/rc tags
release = '10.9.2'
release = '10.10.0'
root_doc = 'index'

# -- General configuration ---------------------------------------------------
Expand Down
11 changes: 8 additions & 3 deletions developer_tests/build_everything/README
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
Run all quickbuilds.sh in the DART Repo at once

Run with a fresh checkout of DART
Edit mkmf.template.compile_all to match the compiler you want to run with
Recommend running on Cheyenne with submit_me.sh as run_all_quickbuilds.sh uses a lot of threads
Usage: ./submit_jobs.sh

To run on a specific branch in DART:

./submit_jobs.sh branch_name

Find failed builds in logfile, e.g.:
grep -a FAILED build-everything-nvhpc.o2633030
65 changes: 0 additions & 65 deletions developer_tests/build_everything/all_quickbuilds

This file was deleted.

158 changes: 0 additions & 158 deletions developer_tests/build_everything/mkmf.template.compile_all

This file was deleted.

Loading

0 comments on commit 99ebec5

Please sign in to comment.