From d5fc56ecc37e3859cac0e4d8d5fec3917ac2b784 Mon Sep 17 00:00:00 2001
From: IncubatorShokuhou <1057304556@qq.com>
Date: Fri, 29 Mar 2024 09:06:44 +0800
Subject: [PATCH 1/2] Remove standard_wrf_dirs list and use wildcard for WRF
 paths

---
 configure | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 946cba98..06c2f7be 100755
--- a/configure
+++ b/configure
@@ -192,7 +192,6 @@ if [ $? -eq 0 ] ; then
 fi
 
 wrf_dir="none"
-standard_wrf_dirs="WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3"
 
 if [ ${nowrf} -eq 0 ]; then
    #
@@ -201,14 +200,19 @@ if [ ${nowrf} -eq 0 ]; then
    # the WRF I/O library from the code in $WRF_DIR
    #
    if [ -z "$WRF_DIR" ]; then
-   #   for d in WRF WRF-4.0.3 WRF-4.0.2 WRF-4.0.1 WRF-4.0 WRFV3; do
-      for d in ${standard_wrf_dirs}; do
-         if [ -e ../${d}/external/io_netcdf/libwrfio_nf.a ]; then
-            echo "Found what looks like a valid WRF I/O library in ../${d}"
-            wrf_dir="../${d}"
-            break
+      # Use the find command with regular expressions to search for matching directories, matching the patterns of WRF, WRFV3, WRF-4.? and WRF-4.?.?
+      # -maxdepth 1 limits the search depth to the immediate subdirectories of the current directory
+      # -regex provides a complete regular expression to match directory names
+      # -type d only matches directories
+      # Note: Regular expressions require full path matching, hence using .* at the beginning
+      # Use a while loop to read the output of the find command
+      while IFS= read -r FOUND_DIR; do
+         if [ -e "$FOUND_DIR/external/io_netcdf/libwrfio_nf.a" ]; then
+               echo "Found what looks like a valid WRF I/O library in ${FOUND_DIR}"
+               WRF_DIR=$FOUND_DIR
+               break # break once found WRF I/o 
          fi
-      done
+      done < <(find .. -maxdepth 1 -type d -regex ".*\(WRFV3\|WRF\|WRF-4\.[0-9]\|WRF-4\.[0-9]\.[0-9]\)")
    else
       if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then
          echo ""

From d638348aed8461b75c69f8eb94edbf2006e64a48 Mon Sep 17 00:00:00 2001
From: IncubatorShokuhou <1057304556@qq.com>
Date: Sat, 11 May 2024 09:35:48 +0800
Subject: [PATCH 2/2] better standard_wrf_dir

---
 configure | 32 +++++++++++++++++++-------------
 1 file changed, 19 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index 06c2f7be..22888e40 100755
--- a/configure
+++ b/configure
@@ -200,19 +200,25 @@ if [ ${nowrf} -eq 0 ]; then
    # the WRF I/O library from the code in $WRF_DIR
    #
    if [ -z "$WRF_DIR" ]; then
-      # Use the find command with regular expressions to search for matching directories, matching the patterns of WRF, WRFV3, WRF-4.? and WRF-4.?.?
-      # -maxdepth 1 limits the search depth to the immediate subdirectories of the current directory
-      # -regex provides a complete regular expression to match directory names
-      # -type d only matches directories
-      # Note: Regular expressions require full path matching, hence using .* at the beginning
-      # Use a while loop to read the output of the find command
-      while IFS= read -r FOUND_DIR; do
-         if [ -e "$FOUND_DIR/external/io_netcdf/libwrfio_nf.a" ]; then
-               echo "Found what looks like a valid WRF I/O library in ${FOUND_DIR}"
-               WRF_DIR=$FOUND_DIR
-               break # break once found WRF I/o 
-         fi
-      done < <(find .. -maxdepth 1 -type d -regex ".*\(WRFV3\|WRF\|WRF-4\.[0-9]\|WRF-4\.[0-9]\.[0-9]\)")
+      # find WRF dir
+      if [ -e "../WRF/external/io_netcdf/libwrfio_nf.a" ]; then
+        echo "Found what looks like a valid WRF I/O library in ../WRF"
+        WRF_DIR="../WRF"
+      else
+        # If the WRF directory does not exist or libwrfio_nf.a is not found, search for directories starting with WRF-4 in descending order of version number
+        for dir in $(ls .. | grep '^WRF-4' | sort -rV); do
+          if [ -e "../$dir/external/io_netcdf/libwrfio_nf.a" ]; then
+            echo "Found what looks like a valid WRF I/O library in ../$dir"
+            WRF_DIR="../$dir"
+            break
+          fi
+        done
+        # If still not found, finally try to search for the WRFV3 directory
+        if [ -z "$WRF_DIR" ] && [ -e "../WRFV3/external/io_netcdf/libwrfio_nf.a" ]; then
+          echo "Found what looks like a valid WRF I/O library in ../WRFV3"
+          WRF_DIR="../WRFV3"
+        fi
+      fi
    else
       if [ ! -e ${WRF_DIR}/external/io_netcdf/libwrfio_nf.a ]; then
          echo ""