-add scotch lib in matrix_cmake_datarmor

-force CFX, CFD, CFK to be outputted as REAL if NCVARTYPE is set at 2 (=depends)
umr-lops · Sep 8, 2023 · ca346a4 · ca346a4
1 parent d86cabc
commit ca346a4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/model/src/ww3_ounf.F90 b/model/src/ww3_ounf.F90
@@ -1973,14 +1973,17 @@ SUBROUTINE W3EXNC ( NX, NY, IX1, IXN, IY1, IYN, NSEA,             &
             !
             ! Maximum CFL for spatial advection
           ELSE IF ( IFI .EQ. 9 .AND. IFJ .EQ. 3 ) THEN
+            IF (NCVARTYPEI.EQ.3) NCVARTYPE=4
             CALL S2GRID(CFLXYMAX, X1)
             !
             ! Maximum CFL for direction advection
           ELSE IF ( IFI .EQ. 9 .AND. IFJ .EQ. 4 ) THEN
+            IF (NCVARTYPEI.EQ.3) NCVARTYPE=4
             CALL S2GRID(CFLTHMAX, X1)
             !
             ! Maximum CFL for frequency advection
           ELSE IF ( IFI .EQ. 9 .AND. IFJ .EQ. 5 ) THEN
+            IF (NCVARTYPEI.EQ.3) NCVARTYPE=4
             CALL S2GRID(CFLKMAX, X1)
             !
             ! User defined...

diff --git a/regtests/bin/matrix_cmake_datarmor b/regtests/bin/matrix_cmake_datarmor
@@ -112,6 +112,7 @@ main_dir="`cd $main_dir 1>/dev/null 2>&1 && pwd`"
   echo "  export NETCDF_CONFIG=/home/datawork-wave/NETCDF2019/${COMP}/bin/nc-config"  >> matrix.head
   echo "  export NetCDF_ROOT=/home/datawork-wave/NETCDF2019/${COMP}"  >> matrix.head
   echo "  export METIS_PATH=/home/datawork-wave/PARMETIS2019/${COMP}"                 >> matrix.head
+  echo "  export SCOTCH_PATH=/home/datawork-wave/LIB/SCOTCH/v7.0.3/${COMP}"                 >> matrix.head
   echo "  export WW3_PARCOMPN=4"                                                      >> matrix.head
   echo "  export G2_LIB4=/home/datawork-wave/NCEPLIBS/${COMP}/g2-3.4.5/lib64/libg2_4.a"            >> matrix.head
   echo "  export BACIO_LIB4=/home/datawork-wave/NCEPLIBS/${COMP}/bacio-2.4.1/lib/libbacio_4.a"      >> matrix.head