Merge pull request #67 from ghassan-alaka/develop

Merge latest `develop` into `master` to prep for v0.4.1
ghassan-alaka · Aug 3, 2023 · 27be5cb · 27be5cb
2 parents 7128786 + 6ecb75c
commit 27be5cb
Show file tree

Hide file tree

Showing 19 changed files with 151 additions and 78 deletions.
diff --git a/sorc/GPLOT/batch/batch_airsea.sh b/sorc/GPLOT/batch/batch_airsea.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
+##SBATCH --nodes=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:59:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -9,7 +10,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=128G
 
 set -x
 

diff --git a/sorc/GPLOT/batch/batch_maps.sh b/sorc/GPLOT/batch/batch_maps.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
+##SBATCH --nodes=1
 ##SBATCH --ntasks-per-node=12
+#SBATCH --ntasks=1
 #SBATCH --time=00:59:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=32G
 
 set -x
 

diff --git a/sorc/GPLOT/batch/batch_ocean_maps.sh b/sorc/GPLOT/batch/batch_ocean_maps.sh
@@ -1,7 +1,8 @@
 #!/bin/sh -x
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
+##SBATCH --nodes=1
 ##SBATCH --ntasks-per-node=12
+#SBATCH --ntasks=1
 #SBATCH --time=00:59:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=32G
 
 set -x
 

diff --git a/sorc/GPLOT/batch/batch_polar.sh b/sorc/GPLOT/batch/batch_polar.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
+##SBATCH --nodes=1
 ##SBATCH --ntasks-per-node=12
+#SBATCH --ntasks=1
 #SBATCH --time=00:59:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=64G
 
 set -x
 

diff --git a/sorc/GPLOT/batch/batch_ships.sh b/sorc/GPLOT/batch/batch_ships.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
+##SBATCH --nodes=1
 ##SBATCH --ntasks-per-node=12
+#SBATCH --ntasks=1
 #SBATCH --time=00:59:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=48G
 
 set -x
 

diff --git a/sorc/GPLOT/batch/spawn_airsea.sh b/sorc/GPLOT/batch/spawn_airsea.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=1
+##SBATCH --nodes=1
+##SBATCH --ntasks-per-node=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:15:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=1G
 
 
 #set -x
@@ -999,7 +1000,7 @@ if [ "${DO_AIRSEA}" = "True" ]; then
                                 ${FULL_CMD} &
                             else
                                 SLRM_OPTS="--account=${CPU_ACCT} --job-name=${JOB_NAME} --output=${LOGFILE2} --error=${LOGFILE2}"
-                                SLRM_OPTS="${SLRM_OPTS} --nodes=1 --mem=128G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
+                                SLRM_OPTS="${SLRM_OPTS} --ntasks=1 --mem=128G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
                                 echo "MSG: Executing this command [${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}]."
                                 ${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}
                             fi

diff --git a/sorc/GPLOT/batch/spawn_maps.sh b/sorc/GPLOT/batch/spawn_maps.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=1
+##SBATCH --nodes=1
+##SBATCH --ntasks-per-node=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:19:30
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=1G
 
 
 #set -x
@@ -1079,7 +1080,7 @@ if [ "${DO_MAPS}" = "True" ]; then
                             else
                                 SLRM_OPTS="--account=${CPU_ACCT} --job-name=${JOB_NAME} --output=${LOGFILE2} --error=${LOGFILE2}"
                                 #SLRM_OPTS="${SLRM_OPTS} --nodes=1 --ntasks-per-node=12 --mem=32G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
-                                SLRM_OPTS="${SLRM_OPTS} --nodes=1 --mem=32G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
+                                SLRM_OPTS="${SLRM_OPTS} --ntasks=1 --mem=32G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
                                 echo "MSG: Executing this command [${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}]."
                                 ${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}
                             fi

diff --git a/sorc/GPLOT/batch/spawn_ocean_maps.sh b/sorc/GPLOT/batch/spawn_ocean_maps.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=1
+##SBATCH --nodes=1
+##SBATCH --ntasks-per-node=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:15:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=1G
 
 
 #set -x
@@ -1071,7 +1072,7 @@ if [ "${DO_OCEAN_MAPS}" = "True" ]; then
                             else
                                 SLRM_OPTS="--account=${CPU_ACCT} --job-name=${JOB_NAME} --output=${LOGFILE2} --error=${LOGFILE2}"
                                 #SLRM_OPTS="${SLRM_OPTS} --nodes=1 --ntasks-per-node=12 --mem=32G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
-                                SLRM_OPTS="${SLRM_OPTS} --nodes=1 --mem=32G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
+                                SLRM_OPTS="${SLRM_OPTS} --ntasks=1 --mem=32G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
                                 echo "MSG: Executing this command [${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}]."
                                 ${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}
                             fi

diff --git a/sorc/GPLOT/batch/spawn_polar.sh b/sorc/GPLOT/batch/spawn_polar.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=1
+##SBATCH --nodes=1
+##SBATCH --ntasks-per-node=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:15:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=1G
 
 
 #set -x
@@ -996,7 +997,7 @@ if [ "${DO_POLAR}" = "True" ]; then
                             else
                                 SLRM_OPTS="--account=${CPU_ACCT} --job-name=${JOB_NAME} --output=${LOGFILE2} --error=${LOGFILE2}"
                                 #SLRM_OPTS="${SLRM_OPTS} --nodes=1 --ntasks-per-node=12 --mem=64G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
-                                SLRM_OPTS="${SLRM_OPTS} --nodes=1 --mem=64G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
+                                SLRM_OPTS="${SLRM_OPTS} --ntasks=1 --mem=64G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
                                 echo "MSG: Executing this command [${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}]."
                                 ${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}
                             fi

diff --git a/sorc/GPLOT/batch/spawn_ships.sh b/sorc/GPLOT/batch/spawn_ships.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=1
+##SBATCH --nodes=1
+##SBATCH --ntasks-per-node=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:15:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=1G
 
 
 #set -x
@@ -1006,7 +1007,7 @@ if [ "${DO_SHIPS}" = "True" ]; then
                             else
                                 SLRM_OPTS="--account=${CPU_ACCT} --job-name=${JOB_NAME} --output=${LOGFILE2} --error=${LOGFILE2}"
                                 #SLRM_OPTS="${SLRM_OPTS} --nodes=1 --ntasks-per-node=12 --mem=48G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
-                                SLRM_OPTS="${SLRM_OPTS} --nodes=1 --mem=48G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
+                                SLRM_OPTS="${SLRM_OPTS} --ntasks=1 --mem=48G --time=${RUNTIME} --qos=${QOS} --partition=${PARTITION}"
                                 echo "MSG: Executing this command [${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}]."
                                 ${X_SBATCH} ${SLRM_OPTS} ${FULL_CMD}
                             fi

diff --git a/sorc/GPLOT/batch/spawn_stats.sh b/sorc/GPLOT/batch/spawn_stats.sh
@@ -1,7 +1,8 @@
 #!/bin/sh
 #SBATCH --account=hur-aoml
-#SBATCH --nodes=1
-#SBATCH --ntasks-per-node=1
+##SBATCH --nodes=1
+##SBATCH --ntasks-per-node=1
+#SBATCH --ntasks=1
 #SBATCH --time=00:15:00
 #SBATCH --partition=tjet,ujet,sjet,vjet,xjet,kjet
 #SBATCH --mail-type=FAIL
@@ -10,7 +11,7 @@
 #SBATCH --output=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.out
 #SBATCH --error=/lfs1/projects/hur-aoml/Ghassan.Alaka/GPLOT/log/GPLOT.Default.err
 #SBATCH --job-name="GPLOT.Default"
-#SBATCH --mem=16G
+#SBATCH --mem=1G
 
 
 #set -x

diff --git a/sorc/GPLOT/ncl/GPLOT_func.ncl b/sorc/GPLOT/ncl/GPLOT_func.ncl
@@ -757,8 +757,16 @@ begin
 				BDS(0) = TCLATS(i)+6.
 				BDS(1) = TCLATS(i)-6.
 
+        ; TYPE 9: Take +/- 5 degrees around a TC center finding centers at higher levels.
+        else if(TYPE.eq.9)then  if(ismissing(TCLATS(i)))then    print("ERROR: get_dim_lat: TC latitude not found.")
+                                                                exit
+                                end if
+                                BDS(0) = TCLATS(i)+5.
+                                BDS(1) = TCLATS(i)-5.
+
 	end if  end if  end if  end if
 	end if  end if  end if  end if
+	end if
 
 	; Check that the model domain and the graphic domain overlap.
 	if(.not.all(BDS(0:1).eq.0.))then
@@ -833,6 +841,9 @@ begin
 	if(isatt(BOCO,"doPivot"))then	DO_PIVOT = BOCO@doPivot
 	else				DO_PIVOT = True
 	end if
+	if(PIV.gt.max(f->$DIM$) .or. PIV.lt.min(f->$DIM$))then
+		DO_PIVOT = False
+	end if
 
 	; Check if the longitude coordinate is as expected.
 	; -180<->180 needs to be treated differently than 0<->360
@@ -939,8 +950,16 @@ begin
 				BDS(3) = TCLONS(i)+6.
 				BDS(2) = TCLONS(i)-6.
 
+        ; TYPE 9: Take +/- 5 degrees around a TC center finding centers at higher levels.
+        else if(TYPE.eq.9)then  if(ismissing(TCLONS(i)))then    print("ERROR: get_dim_lon: TC longitude not found.")
+                                                                exit
+                                end if
+                                BDS(3) = TCLONS(i)+5.
+                                BDS(2) = TCLONS(i)-5.
+
 	end if  end if  end if  end if
 	end if  end if  end if  end if
+	end if
 	LONF!0   = "lon"
 	LONF&lon = LONF
 	LONF@units = "degrees_east"