fix linter action and any whitespace that snuck in

rem1776 · Jul 2, 2024 · a767232 · a767232
1 parent 2a51893
commit a767232
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 30 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,4 +9,4 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v2
       - name: Run linter
-        uses: NOAA-GFDL/simple_lint@v2
+        uses: NOAA-GFDL/simple_lint@f5aa1fe976bd4c231db0536ba00cbfdc26708253
diff --git a/full/atmos_ocean_fluxes_calc.F90 b/full/atmos_ocean_fluxes_calc.F90
@@ -18,7 +18,7 @@
 !* If not, see <http://www.gnu.org/licenses/>.
 !***********************************************************************
 !> \file
-!> \brief Calculates gas fluxes for atmosphere and ocean 
+!> \brief Calculates gas fluxes for atmosphere and ocean
 module atmos_ocean_fluxes_calc_mod
 
   use FMS

diff --git a/full/coupler_main.F90 b/full/coupler_main.F90
@@ -684,11 +684,11 @@ program coupler_main
       ! This call is just for record keeping of stocks transfer and
       ! does not modify either Ocean or Ice_ocean_boundary
       call flux_ocean_from_ice_stocks(Ocean_state, Ocean, Ice_ocean_boundary)
-      
+
       call fms_diag_send_complete(Time_step_cpld)
       Time_ocean = Time_ocean +  Time_step_cpld
       Time = Time_ocean
-      
+
       call fms_mpp_clock_end(coupler_clocks%ocean)
     endif
 

diff --git a/full/earth_system_model.pdf b/full/earth_system_model.pdf
diff --git a/shared/surface_flux.F90 b/shared/surface_flux.F90
@@ -17,7 +17,7 @@
 !* License along with FMS Coupler.
 !* If not, see <http://www.gnu.org/licenses/>.
 !***********************************************************************
-!> \file 
+!> \file
 !> \brief Handles calculation of fluxes on the exchange grids, see module page for more information
 
 !> \page surface_flux_config Surface Flux Configuration
@@ -117,7 +117,7 @@ module surface_flux_mod
 
 use FMS
 use FMSconstants, only: cp_air, hlv, stefan, rdgas, rvgas, grav, vonkarm
-use ocean_rough_mod, only: cal_z0_hwrf17, cal_zt_hwrf17, read_ocean_rough_scheme  
+use ocean_rough_mod, only: cal_z0_hwrf17, cal_zt_hwrf17, read_ocean_rough_scheme
 use constants_mod, only: vonkarm
 use fms_mod, only: mpp_pe, mpp_root_pe, stdout
 
@@ -177,9 +177,9 @@ module surface_flux_mod
                                            !! heat.  This option is available for legacy purposes, and is not recommended for
                                            !! new experiments.
 logical :: ncar_ocean_flux_multilevel  = .false. !< Use NCAR climate model turbulent flux calculation described by Large and Yeager, allows for different reference height for wind, temp and spec. hum.
-logical :: do_iter_monin_obukhov       = .false. !< If .TRUE,  call monin obukhov funtcions a couple of times to update 
-                                                 !! rough_mom, rough_heat, rough_moist, cd, ch, b_star, u_star 
-logical :: use_u10_neutral             = .false. !< If .TRUE., use 10m neutral wind rather than the standard 10m wind 
+logical :: do_iter_monin_obukhov       = .false. !< If .TRUE,  call monin obukhov funtcions a couple of times to update
+                                                 !! rough_mom, rough_heat, rough_moist, cd, ch, b_star, u_star
+logical :: use_u10_neutral             = .false. !< If .TRUE., use 10m neutral wind rather than the standard 10m wind
                                                  !! to obtain rough_mom, rough_heat, rough_moist
 real :: bulk_zu = 10.                      !< Reference height for wind speed (meters)
 real :: bulk_zt = 10.                      !< Reference height for atm temperature (meters)
@@ -727,14 +727,14 @@ subroutine surface_flux_init
 
   ! read rough_scheme_ocean from ocean_rough namelist
   ! Note that we should not use the variable 'rough_scheme' directly from ocean_rough,
-  ! because the intialization of ocean_rough is later than the surface_flux_init. 
+  ! because the intialization of ocean_rough is later than the surface_flux_init.
   if (do_iter_monin_obukhov) then
-    call read_ocean_rough_scheme(rough_scheme_ocean) 
+    call read_ocean_rough_scheme(rough_scheme_ocean)
     if (mpp_pe() == mpp_root_pe() ) then
      write (outunit,*) 'ocean roughness scheme: ', rough_scheme_ocean
      write (outunit,*) 'Warning: if ocean roughness scheme is not hwrf17,           &
                         iter_monin_obukhov_ocean is not effective'
-    endif 
+    endif
   endif
 
   ! write version number
@@ -1044,7 +1044,7 @@ subroutine iter_monin_obukhov_ocean (                      &
 
   real   , intent(in), dimension(:)    ::                  &
            z_atm,      & !< Height at the lowest atmospheric level
-           u_atm,      & !< Zonal wind velocity at the lowest atmospheric level 
+           u_atm,      & !< Zonal wind velocity at the lowest atmospheric level
            v_atm,      & !< Meridional wind velocity at the lowest atmospheric level
            w_atm,      & !< Absolute wind at the lowest atmospheric level
            thv_atm,    & !< Surface air theta_v
@@ -1070,11 +1070,11 @@ subroutine iter_monin_obukhov_ocean (                      &
   ! ---- local vars -----------------------------------------------------------
   real, dimension(size(z_atm(:)))      ::                  &
            flux_q, q_star,                                 &
-           ref_u, ref_v, u10, del_m, del_h, del_q,         &         
+           ref_u, ref_v, u10, del_m, del_h, del_q,         &
            rough_mom1, rough_heat1, rough_moist1
   integer i, j
 
-  do i = 1, niter_monin_obukhov                             
+  do i = 1, niter_monin_obukhov
    do j = 1, size(avail)
     if (avail(j) .and. seawater(j)) then
 

diff --git a/simple/coupler_main.F90 b/simple/coupler_main.F90
@@ -513,7 +513,7 @@ subroutine coupler_end
     call atmos_model_end (Atm)
     call  land_model_end (Atmos_land_boundary, Land)
     call   ice_model_end (Ice)
-    
+
     call fms_diag_end (Time_atmos)
 #ifdef use_deprecated_io
     call  fms_io_exit

diff --git a/simple/flux_exchange.F90 b/simple/flux_exchange.F90
@@ -1204,7 +1204,7 @@ subroutine surface_flux_2d (                                           &
        thv_atm,   thv_surf,                                  &
        cd_m,      cd_t,       cd_q
   real, intent(inout), dimension(:,:) :: q_surf, rough_mom,  &
-       rough_heat, rough_moist 
+       rough_heat, rough_moist
   real, intent(in) :: dt
 
   ! ---- local vars -----------------------------------------------------------

diff --git a/simple/ice_model.F90 b/simple/ice_model.F90
@@ -58,12 +58,12 @@ module ice_model_mod
 logical :: use_annual_sst           = .false.
 character(len=64) :: ice_method = 'prognostic' ! none, uniform, or prognostic
 character(len=64) :: sst_method = 'specified'  ! specified, uniform, or mixed_layer
-                                               ! Additional sst specifications: 'aqua_planet_#' test cases are derived 
-                                               ! from the 2000 paper by Neale and Hoskins, 'A standard test for AGCMs including 
-                                               ! their physical parameterizations: I. The proposal, Atmospheric Science Letters'.   
-                                               ! The 'aqua_planet_1' testcase corresponds to the 'Control' SST test case and 
+                                               ! Additional sst specifications: 'aqua_planet_#' test cases are derived
+                                               ! from the 2000 paper by Neale and Hoskins, 'A standard test for AGCMs including
+                                               ! their physical parameterizations: I. The proposal, Atmospheric Science Letters'.
+                                               ! The 'aqua_planet_1' testcase corresponds to the 'Control' SST test case and
                                                ! provides the pattern which is shifted for the subsequent cases.
-                                               ! The test cases Control, and aqua_planet_5N-aqua_planet_60N were documented and used 
+                                               ! The test cases Control, and aqua_planet_5N-aqua_planet_60N were documented and used
                                                ! in Burnett et al., 2021, GRL,  https://doi.org/10.1029/2020GL091980
                                                !   aqua_planet_1   = Control profile
                                                !   aqua_planet_2   = Peaked

diff --git a/t/null_model_build.sh b/t/null_model_build.sh
@@ -66,28 +66,28 @@ coupler_simple_test.x: coupler_simple/libcoupler_simple.a atmos/libatmos_null.a
 <TAB>\$(LD) \$^ \$(LDFLAGS) -o \$@ \$(STATIC_LIBS)
 
 fms/libfms.a:  FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=fms \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=fms \$(@F)
 
 ocean/libocean_null.a: fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=ocean \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=ocean \$(@F)
 
 atmos/libatmos_null.a: fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=atmos \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=atmos \$(@F)
 
 ice_param/libice_param.a: fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=ice_param \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=ice_param \$(@F)
 
 ice/libice_null.a: ocean/libocean_null.a ice_param/libice_param.a fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=ice \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=ice \$(@F)
 
 land/libland_null.a: fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=land \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=land \$(@F)
 
 coupler_full/libcoupler_full.a: atmos/libatmos_null.a ice/libice_null.a ice_param/libice_param.a ocean/libocean_null.a land/libland_null.a fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=coupler_full \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=coupler_full \$(@F)
 
 coupler_simple/libcoupler_simple.a: atmos/libatmos_null.a ice/libice_null.a ice_param/libice_param.a ocean/libocean_null.a land/libland_null.a fms/libfms.a FORCE
-<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=coupler_simple \$(@F) 
+<TAB>\$(MAKE) SRCROOT=\$(SRCROOT) BUILDROOT=\$(BUILDROOT) MK_TEMPLATE=\$(MK_TEMPLATE)  --directory=coupler_simple \$(@F)
 
 FORCE: