From 11989357de53a5ef8b39d7724a0d4894726e0e3a Mon Sep 17 00:00:00 2001
From: rem1776 <Ryan.Mulhall@noaa.gov>
Date: Mon, 10 Jun 2024 10:56:29 -0400
Subject: [PATCH] fixes for ci and linter

---
 mpp/mpp.F90                 | 2 +-
 test_fms/fms/Makefile.am    | 2 +-
 test_fms/mpp/test_stdlog.sh | 8 +++++---
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/mpp/mpp.F90 b/mpp/mpp.F90
index ea22d2f62f..15aaa60cb0 100644
--- a/mpp/mpp.F90
+++ b/mpp/mpp.F90
@@ -1273,7 +1273,7 @@ module mpp_mod
   logical              :: mpp_record_timing_data=.TRUE.
   type(clock),save     :: clocks(MAX_CLOCKS)
   integer              :: log_unit, etc_unit
-  integer              :: warn_unit !< unit number of the warning log 
+  integer              :: warn_unit !< unit number of the warning log
   character(len=32), parameter    :: configfile='logfile'
   character(len=32), parameter    :: warnfile='warnfile' !< base name for warninglog (appends ".<PE>.out")
   integer              :: peset_num=0, current_peset_num=0
diff --git a/test_fms/fms/Makefile.am b/test_fms/fms/Makefile.am
index f1ceef9ed9..8c2e2fb46b 100644
--- a/test_fms/fms/Makefile.am
+++ b/test_fms/fms/Makefile.am
@@ -49,7 +49,7 @@ TESTS = test_fms2.sh
 # These will also be included in the distribution.
 EXTRA_DIST = test_fms2.sh
 
-CLEANFILES = input.nml logfile.*.out *.mod *.o *.dpi *.spi *.dyn *.spl
+CLEANFILES = input.nml *.out *.mod *.o *.dpi *.spi *.dyn *.spl
 
 clean-local:
 	rm -rf RESTART
diff --git a/test_fms/mpp/test_stdlog.sh b/test_fms/mpp/test_stdlog.sh
index 53df1f7415..f4471e0448 100755
--- a/test_fms/mpp/test_stdlog.sh
+++ b/test_fms/mpp/test_stdlog.sh
@@ -27,6 +27,8 @@
 # Set common test settings.
 . ../test-lib.sh
 
+output_dir
+
 # ensure input.nml file present
 cat <<_EOF  > input.nml
 &test_stdlog_nml
@@ -35,16 +37,16 @@ cat <<_EOF  > input.nml
 _EOF
 # Run test with one processor
 test_expect_success "test stdlog and stdwarn" '
-    mpirun -n 2 ./test_stdlog
+    mpirun -n 2 ../test_stdlog
 '
 sed -i 's/1/2/' input.nml
 test_expect_failure "test stdlog and stdwarn with fatal output" '
-    mpirun -n 2 ./test_stdlog
+    mpirun -n 2 ../test_stdlog
 '
 # move file so we don't overwrite
 mv warnfile.000000.out warnfile.000000.out.old
 sed -i 's/2/3/' input.nml
 test_expect_success "check stdwarn output" '
-    mpirun -n 1 ./test_stdlog
+    mpirun -n 1 ../test_stdlog
 '
 test_done