Skip to content

Commit

Permalink
fix grib build (NOAA-EMC#7)
Browse files Browse the repository at this point in the history
* non interactive ww3_from_ftp.sh  NOAA-EMC#603

* uniformize regtests output by setting a global output type in the matrix script (NOAA-EMC#605)

* ww3_doxy_tmpl.md: clarify MODULE markup (NOAA-EMC#606)

* namelist feature for program ww3_bound (NOAA-EMC#610)

* doxygen: remove existing doxygen errors prior to markup (NOAA-EMC#611)

* update to not force grib build

* fix typo

Co-authored-by: Mickael Accensi <49198861+mickaelaccensi@users.noreply.github.com>
Co-authored-by: Matthew Masarik <86749872+MatthewMasarik-NOAA@users.noreply.github.com>
  • Loading branch information
3 people authored Feb 17, 2022
1 parent 75f5ad4 commit dfb5e00
Show file tree
Hide file tree
Showing 7 changed files with 25 additions and 11 deletions.
24 changes: 19 additions & 5 deletions regtests/bin/run_cmake_test
Original file line number Diff line number Diff line change
Expand Up @@ -403,10 +403,19 @@ then
path_build=$path_w/build_SHRD
mkdir -p $path_build
cd $path_build
cat $file_c | sed 's/DIST/SHRD/' | sed 's/MPI //' | \
sed 's/OMPG //' | \
sed 's/OMPH //' | sed 's/PDLIB //' | \
sed 's/B4B //' > $path_build/switch
if [[ "$outopt" = "all" ]] || [[ "$outopt" = "grib" ]] ;
then
cat $file_c | sed 's/DIST/SHRD/' | sed 's/MPI //' | \
sed 's/OMPG //' | sed 's/NOGRB/NCEP2/' \
sed 's/OMPH //' | sed 's/PDLIB //' | \
sed 's/B4B //' > $path_build/switch
else
cat $file_c | sed 's/DIST/SHRD/' | sed 's/MPI //' | \
sed 's/OMPG //' | \
sed 's/OMPH //' | sed 's/PDLIB //' | \
sed 's/B4B //' > $path_build/switch
fi

echo "Switch file is $path_build/switch with switches:" >> $ofile
cat $path_build/switch >> $ofile
cmake $path_cmake -DSWITCH=$path_build/switch -DCMAKE_INSTALL_PREFIX=install > $ofile 2>&1
Expand Down Expand Up @@ -469,7 +478,12 @@ else
path_build=$path_w/build
mkdir -p $path_build
cd $path_build
\cp -f $file_c $path_build/switch
if [[ "$outopt" = "all" ]] || [[ "$outopt" = "grib" ]] ;
then
cat $file_c | sed 's/NOGRB/NCEP2/' > $path_build/switch
else
\cp -f $file_c $path_build/switch
fi
echo "Switch file is $path_build/switch with switches:" >> $ofile
cat $path_build/switch >> $ofile
cmake $path_cmake -DSWITCH=$path_build/switch -DCMAKE_INSTALL_PREFIX=install > $ofile 2>&1
Expand Down
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.17/input/switch_NO_PDLIB
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NCEP2 TRKNC DIST MPI SCRIP MLIM PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IS0 IC0 REF0 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
NOGRB TRKNC DIST MPI SCRIP MLIM PR3 UQ FLX0 LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IS0 IC0 REF0 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
2 changes: 1 addition & 1 deletion regtests/ww3_tp2.17/input/switch_PDLIB
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NCEP2 TRKNC DIST MPI SCRIP MLIM PR3 UQ FLX0 PDLIB LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IS0 IC0 REF0 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
NOGRB TRKNC DIST MPI SCRIP MLIM PR3 UQ FLX0 PDLIB LN1 ST4 STAB0 NL1 BT4 DB1 TR0 BS0 IS0 IC0 REF0 WNT2 WNX1 RWND CRT1 CRX1 O0 O1 O2 O2a O2b O2c O3 O4 O5 O6 O7
2 changes: 1 addition & 1 deletion regtests/ww3_ufs1.1/input/switch_MPI
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NCO NCEP2 DIST MPI SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
NCO NOGRB DIST MPI SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
2 changes: 1 addition & 1 deletion regtests/ww3_ufs1.1/input/switch_MPI_OMPH
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NCO NCEP2 DIST MPI OMPG OMGH SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
NCO NOGRB DIST MPI OMPG OMGH SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
2 changes: 1 addition & 1 deletion regtests/ww3_ufs1.2/input/switch_MPI_OMPH
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NCO NCEP2 DIST MPI OMPG OMGH SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
NCO NOGRB DIST MPI OMPG OMGH SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
2 changes: 1 addition & 1 deletion regtests/ww3_ufs1.3/input/switch_MPI_OMPH
Original file line number Diff line number Diff line change
@@ -1 +1 @@
NCO NCEP2 DIST MPI OMPG OMGH SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0
NCO NOGRB DIST MPI OMPG OMGH SCRIP SCRIPNC WRST PR3 UQ FLX0 SEED ST4 STAB0 NL1 BT1 DB1 MLIM FLD2 TR0 BS0 RWND WNX1 WNT1 CRX1 CRT1 O0 O1 O2 O3 O4 O5 O6 O7 O14 O15 IC0 IS0 REF0

0 comments on commit dfb5e00

Please sign in to comment.