From cf183b9375a9d059c43a8cb022519f6ae00567fc Mon Sep 17 00:00:00 2001 From: Steven Brus Date: Fri, 2 Apr 2021 08:59:00 -0500 Subject: [PATCH 1/3] Rename ww3_grid.ftn -> w3gridmd.ftn --- model/ftn/{ww3_grid.ftn => w3gridmd.ftn} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename model/ftn/{ww3_grid.ftn => w3gridmd.ftn} (100%) diff --git a/model/ftn/ww3_grid.ftn b/model/ftn/w3gridmd.ftn similarity index 100% rename from model/ftn/ww3_grid.ftn rename to model/ftn/w3gridmd.ftn From 79c01f9fdcd987c38a93c90e31b684108e41cffe Mon Sep 17 00:00:00 2001 From: Steven Brus Date: Fri, 2 Apr 2021 09:19:05 -0500 Subject: [PATCH 2/3] Make body of ww3_grid into module --- model/bin/make_makefile.sh | 3 ++- model/ftn/w3gridmd.ftn | 12 +++++++++--- model/ftn/ww3_grid.ftn | 10 ++++++++++ 3 files changed, 21 insertions(+), 4 deletions(-) create mode 100644 model/ftn/ww3_grid.ftn diff --git a/model/bin/make_makefile.sh b/model/bin/make_makefile.sh index 6b4cd290b9..3112f81a6b 100755 --- a/model/bin/make_makefile.sh +++ b/model/bin/make_makefile.sh @@ -885,7 +885,7 @@ core= data='w3wdatmd w3gdatmd w3adatmd w3idatmd w3odatmd wmmdatmd' prop= - source="w3parall w3triamd $stx $nlx $btx $is $uostmd" + source="w3parall w3triamd w3gridmd $stx $nlx $btx $is $uostmd" IO='w3iogrmd' aux="constants w3servmd w3arrymd w3dispmd w3gsrumd w3timemd w3nmlgridmd $pdlibyow $memcode" if [ "$scrip" = 'SCRIP' ] @@ -1401,6 +1401,7 @@ 'W3SMCOMD' ) modtest=w3smcomd.o ;; 'W3OUNFMETAMD' ) modtest=w3ounfmetamd.o ;; 'W3METAMD' ) modtest=w3metamd.o ;; + 'W3GRIDMD' ) modtest=w3gridmd.o ;; * ) modfound=no ;; esac diff --git a/model/ftn/w3gridmd.ftn b/model/ftn/w3gridmd.ftn index d5bfdf18d8..9425c2b8cc 100644 --- a/model/ftn/w3gridmd.ftn +++ b/model/ftn/w3gridmd.ftn @@ -1,6 +1,6 @@ #include "w3macros.h" !/ ------------------------------------------------------------------- / - PROGRAM W3GRID + MODULE W3GRIDMD !/ !/ +-----------------------------------+ !/ | WAVEWATCH III NOAA/NCEP | @@ -949,6 +949,11 @@ !/ ------------------------------------------------------------------- / !/ DATA YESXNO / 'YES/--' , '---/NO' / + + CONTAINS + + SUBROUTINE W3GRID() + !/O0 FLNMLO = .TRUE. !/STAB2 FLSTB2 = .TRUE. ! @@ -6354,10 +6359,11 @@ ! !/T0 9095 FORMAT ( ' TEST W3GRID : OUTPUT BOUND. POINT SPEC DATA ') !/T0 9096 FORMAT ( ' ',I3,2I8) + + END SUBROUTINE !/ !/ Internal function READNL ------------------------------------------ / !/ - CONTAINS !/ ------------------------------------------------------------------- / SUBROUTINE READNL ( NDS, NAME, STATUS ) !/ @@ -6588,4 +6594,4 @@ !/ !/ End of W3GRID ----------------------------------------------------- / !/ - END PROGRAM W3GRID + END MODULE W3GRIDMD diff --git a/model/ftn/ww3_grid.ftn b/model/ftn/ww3_grid.ftn new file mode 100644 index 0000000000..e9cf01601a --- /dev/null +++ b/model/ftn/ww3_grid.ftn @@ -0,0 +1,10 @@ +#include "w3macros.h" +!/ ------------------------------------------------------------------- / + PROGRAM WW3GRID +!/ ------------------------------------------------------------------- / + USE W3GRIDMD + IMPLICIT NONE + + CALL W3GRID + + END PROGRAM WW3GRID From 6899a0955d583f5213f72494b87ccdbfe5762649 Mon Sep 17 00:00:00 2001 From: Steven Brus Date: Fri, 9 Apr 2021 09:28:46 -0500 Subject: [PATCH 3/3] Substitute w3gridmd for ww3_grid in w3_new --- model/bin/w3_new | 56 ++++++++++++++++++++++++------------------------ 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/model/bin/w3_new b/model/bin/w3_new index d538e71f5f..d030243ada 100755 --- a/model/bin/w3_new +++ b/model/bin/w3_new @@ -87,7 +87,7 @@ 'grib' ) cd $main_dir/ftn ; touch ww3_grib.ftn ;; 'mcp' ) cd $main_dir/ftn ; touch w3wavemd.ftn touch ww3_shel.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'c90' ) cd $main_dir/ftn ; touch w3iogomd.ftn touch w3pro1md.ftn touch w3pro2md.ftn @@ -111,7 +111,7 @@ touch ww3_trnc.ftn ;; 'scrip' ) cd $main_dir/ftn ; touch wmgridmd.ftn touch wmscrpmd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn cd $main_dir/ftn/SCRIP ; touch scrip_interface.ftn ;; 'scripnc') cd $main_dir/ftn ; touch wmgridmd.ftn cd $main_dir/ftn/SCRIP ; touch scrip_interface.ftn ;; @@ -151,7 +151,7 @@ touch wmgridmd.ftn touch ww3_gspl.ftn touch ww3_shel.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'prop' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3adatmd.ftn touch w3idatmd.ftn @@ -162,21 +162,21 @@ touch wmgridmd.ftn touch w3updtmd.ftn touch ww3_shel.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_gspl.ftn ;; 'stress' ) cd $main_dir/ftn ; touch w3srcemd.ftn touch w3gdatmd.ftn touch w3iogrmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch gx_outp.ftn ;; 'dstress') cd $main_dir/ftn ; touch w3srcemd.ftn touch w3gdatmd.ftn touch w3iogrmd.ftn touch w3fld1md.ftn touch w3fld2md.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 's_ln' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3srcemd.ftn touch w3iogrmd.ftn @@ -184,7 +184,7 @@ touch w3adatmd.ftn touch w3iogrmd.ftn touch wminitmd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch ww3_prep.ftn @@ -202,7 +202,7 @@ touch w3iogomd.ftn touch w3updtmd.ftn touch wmesmfmd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch ww3_ounf.ftn @@ -210,7 +210,7 @@ 'stab' ) cd $main_dir/ftn ; touch w3updtmd.ftn touch w3src3md.ftn touch w3src4md.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch gx_outp.ftn ;; @@ -219,7 +219,7 @@ touch w3srcemd.ftn touch w3iogrmd.ftn touch wminitmd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_prep.ftn touch ww3_outp.ftn touch ww3_ounp.ftn @@ -230,7 +230,7 @@ 'snls' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3srcemd.ftn touch w3iogrmd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch gx_outp.ftn ;; 's_bot' ) cd $main_dir/ftn ; touch w3gdatmd.ftn @@ -241,7 +241,7 @@ touch w3profsmd_pdlib.ftn touch w3sic4md.ftn touch w3wavemd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_gint.ftn touch ww3_outp.ftn touch ww3_outf.ftn @@ -253,18 +253,18 @@ touch w3srcemd.ftn touch w3iogrmd.ftn touch w3profsmd_pdlib.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch gx_outp.ftn ;; 'miche' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3srcemd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 's_tr' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3srcemd.ftn touch w3iogrmd.ftn touch w3profsmd_pdlib.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch gx_outp.ftn ;; @@ -272,7 +272,7 @@ touch w3srcemd.ftn touch w3iogrmd.ftn touch w3profsmd_pdlib.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch gx_outp.ftn ;; @@ -283,7 +283,7 @@ touch w3updtmd.ftn touch w3wavemd.ftn touch w3srcemd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch ww3_shel.ftn @@ -296,7 +296,7 @@ touch w3sic2md.ftn touch w3wavemd.ftn touch ww3_gint.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_ounf.ftn touch ww3_outf.ftn touch ww3_shel.ftn @@ -313,11 +313,11 @@ touch w3triamd.ftn touch w3updtmd.ftn touch w3wavemd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 's_xx' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3srcemd.ftn touch w3iogrmd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_outp.ftn touch ww3_ounp.ftn touch gx_outp.ftn ;; @@ -328,11 +328,11 @@ 'rwind' ) cd $main_dir/ftn ; touch w3updtmd.ftn touch w3gdatmd.ftn touch w3iogrmd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'wcor' ) cd $main_dir/ftn ; touch w3updtmd.ftn touch w3gdatmd.ftn touch w3iogrmd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'rstwind') cd $main_dir/ftn ; touch wmesmfmd.ftn touch w3idatmd.ftn touch w3iorsmd.ftn ;; @@ -352,12 +352,12 @@ touch wminitmd.ftn touch ww3_shel.ftn ;; 'mggse' ) cd $main_dir/ftn ; touch w3pro3md.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_shel.ftn ;; 'subsec' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3iogrmd.ftn touch w3wavemd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'tdyn' ) cd $main_dir/ftn ; touch w3pro2md.ftn touch w3psmcmd.ftn ;; 'dss0' ) cd $main_dir/ftn ; touch w3pro2md.ftn @@ -380,7 +380,7 @@ touch w3ref1md.ftn touch w3src4md.ftn touch w3srcemd.ftn - touch ww3_grid.ftn + touch w3gridmd.ftn touch ww3_ounp.ftn touch ww3_outp.ftn ;; 'rotag' ) cd $main_dir/ftn ; touch w3gdatmd.ftn @@ -393,13 +393,13 @@ touch ww3_ounf.ftn touch ww3_ounp.ftn touch ww3_outf.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'arctic' ) cd $main_dir/ftn ; touch w3gdatmd.ftn touch w3iogrmd.ftn touch w3psmcmd.ftn touch w3updtmd.ftn touch w3wavemd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'nnt' ) cd $main_dir/ftn ; touch w3srcemd.ftn ;; 'mprf' ) cd $main_dir/ftn ; touch wmmdatmd.ftn touch wminitmd.ftn @@ -469,7 +469,7 @@ touch w3iogrmd.ftn touch w3srcemd.ftn touch w3wavemd.ftn - touch ww3_grid.ftn ;; + touch w3gridmd.ftn ;; 'b4b' ) cd $main_dir/ftn ; touch w3psmcmd.ftn ;; * ) echo "w3_new: keyword [$key] not recognized" ;; esac