Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Tag CI libFMS with AM4 regression

on:
push:
tags:
Expand All @@ -14,7 +14,7 @@ jobs:
max-parallel: 3
matrix:
include:
# Runs AM4 with intel18 on AM4_intel18
# Runs AM4 with intel18 on AM4_intel18
# - runname: AM4 build and run with intel 18
# runscript: python3 /home/Thomas.Robinson/pw/storage/pw_api_python/AM4_intel18StartClusters.py am4_intel18
# Runs AM4 using a container to build and run the model with intel 21
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build_cmake_gnu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on: [push, pull_request]

jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-latest
strategy:
matrix:
omp-flags: [ -DOPENMP=on, -DOPENMP=off ]
Expand All @@ -16,7 +16,7 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Generate makefiles with CMake
- name: Generate makefiles with CMake
run: cmake $CMAKE_FLAGS .
- name: Build the library
run: make
2 changes: 1 addition & 1 deletion .github/workflows/lint_fms.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ jobs:
- name: Checkout code
uses: actions/checkout@v2
- name: Run Lint
uses: NOAA-GFDL/simple_lint@v2
uses: NOAA-GFDL/simple_lint@v3
4 changes: 2 additions & 2 deletions .github/workflows/parallelWorks_intel_pr.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: Pull Request CI libFMS with intel18 and intel21

on: [pull_request,workflow_dispatch]
jobs:
parallelWorks:
Expand All @@ -9,7 +9,7 @@ jobs:
max-parallel: 2
matrix:
include:
# Turn this back on when fixed
# Turn this back on when fixed
- runname: FMS with intel 18
runscript: python3 /home/Thomas.Robinson/pw/storage/pw_api_python/PRFMSintel18StartClusters.py $GITHUB_REF
# Runs on FMS_CONTAINER_CI cluster
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/update_docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v2
- name: Setup repo
- name: Setup repo
run: | # do autotool's job for substitutes since we don't need a full build environement
mkdir gen_docs
sed 's/@abs_top_builddir@\/docs/gen_docs/' docs/Doxyfile.in > gen_docs/Doxyfile
Expand Down
4 changes: 2 additions & 2 deletions Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,9 @@ AM_FCFLAGS = $(FC_MODINC). $(FC_MODOUT)$(MODDIR)
noinst_LTLIBRARIES = libFMS_mod.la
libFMS_mod_la_SOURCES = libFMS.F90

fms.$(FC_MODEXT): .mods/*_mod.$(FC_MODEXT)
fms.$(FC_MODEXT): .mods/*_mod.$(FC_MODEXT)

nodist_include_HEADERS = libFMS_mod.la
nodist_include_HEADERS = libFMS_mod.la

include $(top_srcdir)/mkmods.mk

Expand Down
9 changes: 6 additions & 3 deletions amip_interp/amip_interp.F90
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@
!!
!! 1. AMIP @link http://www-pcmdi.llnl.gov/amip @endlink from Jan 1979 to Jan 1989 (2 deg x 2 deg)
!! 2. Reynolds OI @link amip_interp.rey_oi.txt @endlink from Nov 1981 to Jan 1999 (1 deg x 1 deg)
!! 3. Reynolds EOF @link ftp://podaac.jpl.nasa.gov/pub/sea_surface_temperature/reynolds/rsst/doc/rsst.html @endlink from Jan 1950 to Dec 1998 (2 deg x 2 deg)
!! 3. Reynolds EOF @link ftp://podaac.jpl.nasa.gov/pub/sea_surface_temperature/reynolds/rsst/doc/rsst.html
!! @endlink from Jan 1950 to Dec 1998 (2 deg x 2 deg)
!!
!! All original data are observed monthly means. This module
!! interpolates linearly in time between pairs of monthly means.
Expand Down Expand Up @@ -500,7 +501,8 @@ subroutine get_amip_sst (Time, Interp, sst, err_msg, lon_model, lat_model)
if (DEBUG) then
call get_date(Amip_Time,jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6))
if (mpp_pe() == 0) then
write (*,200) 'JHC: use_daily = F, AMIP_Time: ',jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6)
write (*,200) 'JHC: use_daily = F, AMIP_Time: ',jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5), &
& jhctod(6)
write (*,300) 'JHC: use_daily = F, interped SST: ', sst(1,1),sst(5,5),sst(10,10)
endif
endif
Expand All @@ -511,7 +513,8 @@ subroutine get_amip_sst (Time, Interp, sst, err_msg, lon_model, lat_model)
! add by JHC
else
call get_date(Amip_Time,jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6))
if (mpp_pe() == mpp_root_pe()) write(*,200) 'amip_interp_mod: use_daily = T, Amip_Time = ',jhctod(1),jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6)
if (mpp_pe() == mpp_root_pe()) write(*,200) 'amip_interp_mod: use_daily = T, Amip_Time = ',jhctod(1), &
& jhctod(2),jhctod(3),jhctod(4),jhctod(5),jhctod(6)

yr = jhctod(1); mo = jhctod(2); dy = jhctod(3)

Expand Down
23 changes: 15 additions & 8 deletions astronomy/astronomy.F90
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,8 @@ module astronomy_mod
!! @param [in] <time> Time at which astronomical values are desired (time_type variable) [seconds, days]
!! @param [out] <cosz> Cosine of solar zenith angle, set to zero when entire period is in darkness [dimensionless]
!! @param [out] <fracday> Daylight fraction of time interval [dimensionless]
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2 [dimensionless]
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse
!! (a):(a/r)**2 [dimensionless]
!! @param [in] <dt> OPTIONAL: Time interval after gmt over which the astronomical variables are to be
!! averaged. this produces averaged output rather than instantaneous. [radians], (1 day = 2 * pi)
!! @param [in] <dt_time> OPTIONAL: Time interval after gmt over which the astronomical variables are to be
Expand Down Expand Up @@ -190,8 +191,10 @@ module astronomy_mod
!! @param [in] <time> Time at which astronomical values are desired (time_type variable) [seconds, days]
!! @param [out] <cosz> Cosine of solar zenith angle, set to zero when entire period is in darkness [dimensionless]
!! @param [out] <fracday> Daylight fraction of time interval [dimensionless]
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2 [dimensionless]
!! @param [out] <solar> shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared) [dimensionless]
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse
!! (a):(a/r)**2 [dimensionless]
!! @param [out] <solar> shortwave flux factor: cosine of zenith angle * daylight fraction /
!! (earth-sun distance squared) [dimensionless]
!> @ingroup astronomy_mod
interface daily_mean_solar
module procedure daily_mean_solar_2d
Expand Down Expand Up @@ -1480,7 +1483,8 @@ end subroutine daily_mean_solar_1d
!! @param [in] <lat> Latitudes of model grid points
!! @param [in] <time_since_ae> Time of year; autumnal equinox = 0.0, one year = 2 * pi
!! @param [out] <cosz> Cosine of solar zenith angle
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
!! (earth-sun distance squared)
subroutine daily_mean_solar_2level (lat, time_since_ae, cosz, solar)

!----------------------------------------------------------------------
Expand Down Expand Up @@ -1649,7 +1653,8 @@ end subroutine daily_mean_solar_cal_1d
!! @param [in] <lat> Latitudes of model grid points
!! @param [in] <time> Time of year (time_type)
!! @param [out] <cosz> Cosine of solar zenith angle
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
!! (earth-sun distance squared)
subroutine daily_mean_solar_cal_2level (lat, time, cosz, solar)

real, dimension(:), intent(in) :: lat
Expand Down Expand Up @@ -1735,7 +1740,8 @@ end subroutine daily_mean_solar_cal_0d
!! @param [in] <jnd> Ending index of latitude window
!! @param [in] <lat> Latitudes of model grid points
!! @param [out] <cosz> Cosine of solar zenith angle
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
!! (earth-sun distance squared)
!! @param [out] <fracday> Daylight fraction of time interval
!! @param [out] <rrsun> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2
subroutine annual_mean_solar_2d (js, je, lat, cosz, solar, fracday, &
Expand Down Expand Up @@ -1842,7 +1848,8 @@ end subroutine annual_mean_solar_2d
!! @param [in] <jnd> Ending index of latitude window
!! @param [in] <lat> Latitudes of model grid points
!! @param [out] <cosz> Cosine of solar zenith angle
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction / (earth-sun distance squared)
!! @param [out] <solar> Shortwave flux factor: cosine of zenith angle * daylight fraction /
!! (earth-sun distance squared)
!! @param [out] <fracday> Daylight fraction of time interval
!! @param [out] <rrsun_out> Earth-Sun distance (r) relative to semi-major axis of orbital ellipse (a):(a/r)**2
subroutine annual_mean_solar_1d (jst, jnd, lat, cosz, solar, &
Expand Down Expand Up @@ -2141,7 +2148,7 @@ function half_day_2d (latitude, dec) result(h)
!---------------------------------------------------------------------
real, dimension (size(latitude,1),size(latitude,2)):: &
cos_half_day, & !< Cosine of half-day length [dimensionless]
lat !< Model latitude, adjusted so that it is never 0.5*pi or -0.5*pi
lat !< Model latitude, adjusted so that it is never 0.5*pi or -0.5*pi
real :: tan_dec !< tangent of solar declination [dimensionless]
real :: eps = 1.0E-05 !< small increment

Expand Down
4 changes: 2 additions & 2 deletions axis_utils/axis_utils.F90
Original file line number Diff line number Diff line change
Expand Up @@ -415,8 +415,8 @@ function frac_index (value, array)
do i=2,ia
if (array(i) < array(i-1)) then
unit = stdout()
write (unit,*) '=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ',&
value
write (unit,*) &
'=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ', value
write (unit,*) ' array(i) < array(i-1) for i=',i
write (unit,*) ' array(i) for i=1..ia follows:'
do ii=1,ia
Expand Down
4 changes: 2 additions & 2 deletions axis_utils/axis_utils2.F90
Original file line number Diff line number Diff line change
Expand Up @@ -442,8 +442,8 @@ function frac_index (value, array)
do i=2,ia
if (array(i) < array(i-1)) then
unit = stdout()
write (unit,*) '=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ',&
value
write (unit,*) &
'=> Error: "frac_index" array must be monotonically increasing when searching for nearest value to ', value
write (unit,*) ' array(i) < array(i-1) for i=',i
write (unit,*) ' array(i) for i=1..ia follows:'
do ii=1,ia
Expand Down
Loading