From 1485337f553714a1fc883d647661b4d3fac31cd8 Mon Sep 17 00:00:00 2001 From: Kelly Werner Date: Wed, 17 Feb 2021 12:50:24 -0700 Subject: [PATCH 1/3] Removed requirement to run run_me_first scripts for ideal cases --- Makefile | 37 +++++++++++++++++++---- test/em_b_wave/run_me_first.csh | 8 ----- test/em_convrad/run_me_first.csh | 15 --------- test/em_quarter_ss/run_me_first.csh | 8 ----- test/em_scm_xy/run_me_first.csh | 13 -------- test/em_seabreeze2d_x/run_me_first.csh | 11 ------- test/em_tropical_cyclone/run_me_first.csh | 10 ------ 7 files changed, 31 insertions(+), 71 deletions(-) delete mode 100755 test/em_b_wave/run_me_first.csh delete mode 100755 test/em_convrad/run_me_first.csh delete mode 100755 test/em_quarter_ss/run_me_first.csh delete mode 100755 test/em_scm_xy/run_me_first.csh delete mode 100755 test/em_seabreeze2d_x/run_me_first.csh delete mode 100755 test/em_tropical_cyclone/run_me_first.csh diff --git a/Makefile b/Makefile index 8e2da2a1fa..730541fd09 100644 --- a/Makefile +++ b/Makefile @@ -229,7 +229,9 @@ em_quarter_ss : wrf ( cd test/em_quarter_ss ; /bin/rm -f kernels.asc_s_0_03_0_9 ; ln -s ../../run/kernels.asc_s_0_03_0_9 . ) ( cd test/em_quarter_ss ; /bin/rm -f kernels_z.asc ; ln -s ../../run/kernels_z.asc . ) ( cd test/em_quarter_ss ; /bin/rm -f masses.asc ; ln -s ../../run/masses.asc . ) - ( cd test/em_quarter_ss ; /bin/rm -f termvels.asc ; ln -s ../../run/termvels.asc . ) + ( cd test/em_quarter_ss ; /bin/rm -f termvels.asc ; ln -s ../../run/termvels.asc . ; \ + ln -sf ../../run/RRTM_DATA . ; \ + ln -sf ../../run/p3* . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -330,7 +332,9 @@ em_b_wave : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal ) ( cd test/em_b_wave ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_b_wave ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_b_wave ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) + ( cd test/em_b_wave ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ + ln -sf ../../run/RRTM_DATA . ; \ + ln -sf ../../run/p3* . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -396,7 +400,11 @@ em_seabreeze2d_x : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal ) ( cd test/em_seabreeze2d_x ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_seabreeze2d_x ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) + ( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ + ln -sf ../../run/LANDUSE.TBL . ; \ + ln -sf ../../run/RRTM_DATA . ; \ + ln -sf ../../run/wind-turbine-1.tbl . ; \ + ln -sf ../../run/p3* . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -427,7 +435,15 @@ em_convrad : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal ) ( cd test/em_convrad ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_convrad ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) + ( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ + ln -sf ../../run/LANDUSE.TBL . ; \ + ln -sf ../../run/RRTM_DATA . ; \ + ln -sf ../../run/RRTMG_LW_DATA . ; \ + ln -sf ../../run/RRTMG_SW_DATA . ; \ + ln -sf ../../run/ozone.formatted . ; \ + ln -sf ../../run/ozone_lat.formatted . ; \ + ln -sf ../../run/ozone_plev.formatted . ; \ + ln -sf ../../run/p3* . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -443,7 +459,10 @@ em_tropical_cyclone : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=tropical_cyclone em_ideal ) ( cd test/em_tropical_cyclone ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_tropical_cyclone ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) + ( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ + ln -sf ../../run/LANDUSE.TBL . ; \ + ln -sf ../../run/RRTM_DATA . ; \ + ln -sf ../../run/p3* . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -476,7 +495,13 @@ em_scm_xy : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=scm_xy em_ideal ) ( cd test/em_scm_xy ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_scm_xy ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) + ( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ + ln -sf ../../run/LANDUSE.TBL . ; \ + ln -sf ../../run/VEGPARM.TBL . ; \ + ln -sf ../../run/SOILPARM.TBL . ; \ + ln -sf ../../run/GENPARM.TBL . ; \ + ln -sf ../../run/RRTM_DATA . ; \ + ln -sf ../../run/p3* . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ diff --git a/test/em_b_wave/run_me_first.csh b/test/em_b_wave/run_me_first.csh deleted file mode 100755 index 19b3a98aba..0000000000 --- a/test/em_b_wave/run_me_first.csh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/csh - -echo Setting up b_wave case by linking data files into this directory - -echo linking to RRTM_DATA in ../../run directory -ln -sf ../../run/RRTM_DATA . - -echo done diff --git a/test/em_convrad/run_me_first.csh b/test/em_convrad/run_me_first.csh deleted file mode 100755 index 5f6ecb639b..0000000000 --- a/test/em_convrad/run_me_first.csh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/csh - -echo Setting up em_convrad case by linking data files into this directory - -echo linking to some physics data files in ../../run directory - -ln -sf ../../run/LANDUSE.TBL . -ln -sf ../../run/RRTM_DATA . -ln -sf ../../run/RRTMG_LW_DATA . -ln -sf ../../run/RRTMG_SW_DATA . -ln -sf ../../run/ozone.formatted . -ln -sf ../../run/ozone_lat.formatted . -ln -sf ../../run/ozone_plev.formatted . - -echo done diff --git a/test/em_quarter_ss/run_me_first.csh b/test/em_quarter_ss/run_me_first.csh deleted file mode 100755 index 29e5379132..0000000000 --- a/test/em_quarter_ss/run_me_first.csh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/csh - -echo Setting up quarter_ss case by linking data files into this directory - -echo linking to RRTM_DATA in ../../run directory -ln -sf ../../run/RRTM_DATA . - -echo done diff --git a/test/em_scm_xy/run_me_first.csh b/test/em_scm_xy/run_me_first.csh deleted file mode 100755 index dfb02090f9..0000000000 --- a/test/em_scm_xy/run_me_first.csh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/csh - -echo Setting up scm_xy case by linking data files into this directory - -echo linking to LANDUSE.TBL in ../../run directory - -ln -sf ../../run/LANDUSE.TBL . -ln -sf ../../run/VEGPARM.TBL . -ln -sf ../../run/SOILPARM.TBL . -ln -sf ../../run/GENPARM.TBL . -ln -sf ../../run/RRTM_DATA . - -echo done diff --git a/test/em_seabreeze2d_x/run_me_first.csh b/test/em_seabreeze2d_x/run_me_first.csh deleted file mode 100755 index 38201dac5c..0000000000 --- a/test/em_seabreeze2d_x/run_me_first.csh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/csh - -echo Setting up seabreeze2d_x case by linking data files into this directory - -echo linking to LANDUSE.TBL in ../../run directory - -ln -sf ../../run/LANDUSE.TBL . -ln -sf ../../run/RRTM_DATA . -ln -sf ../../run/wind-turbine-1.tbl . - -echo done diff --git a/test/em_tropical_cyclone/run_me_first.csh b/test/em_tropical_cyclone/run_me_first.csh deleted file mode 100755 index 90534be363..0000000000 --- a/test/em_tropical_cyclone/run_me_first.csh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/csh - -echo Setting up tropical_cyclone case by linking data files into this directory - -echo linking to LANDUSE.TBL in ../../run directory - -ln -sf ../../run/LANDUSE.TBL . -ln -sf ../../run/RRTM_DATA . - -echo done From 016cd3ac6d50136311728cf863907584c140f046 Mon Sep 17 00:00:00 2001 From: Kelly Werner Date: Thu, 18 Feb 2021 13:28:48 -0700 Subject: [PATCH 2/3] Modified original commit to only include linked files necessary for default cases --- Makefile | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 730541fd09..fa8bd50731 100644 --- a/Makefile +++ b/Makefile @@ -229,9 +229,7 @@ em_quarter_ss : wrf ( cd test/em_quarter_ss ; /bin/rm -f kernels.asc_s_0_03_0_9 ; ln -s ../../run/kernels.asc_s_0_03_0_9 . ) ( cd test/em_quarter_ss ; /bin/rm -f kernels_z.asc ; ln -s ../../run/kernels_z.asc . ) ( cd test/em_quarter_ss ; /bin/rm -f masses.asc ; ln -s ../../run/masses.asc . ) - ( cd test/em_quarter_ss ; /bin/rm -f termvels.asc ; ln -s ../../run/termvels.asc . ; \ - ln -sf ../../run/RRTM_DATA . ; \ - ln -sf ../../run/p3* . ) + ( cd test/em_quarter_ss ; /bin/rm -f termvels.asc ; ln -s ../../run/termvels.asc . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -332,9 +330,7 @@ em_b_wave : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal ) ( cd test/em_b_wave ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_b_wave ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_b_wave ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ - ln -sf ../../run/RRTM_DATA . ; \ - ln -sf ../../run/p3* . ) + ( cd test/em_b_wave ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -402,9 +398,7 @@ em_seabreeze2d_x : wrf ( cd test/em_seabreeze2d_x ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) ( cd test/em_seabreeze2d_x ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ ln -sf ../../run/LANDUSE.TBL . ; \ - ln -sf ../../run/RRTM_DATA . ; \ - ln -sf ../../run/wind-turbine-1.tbl . ; \ - ln -sf ../../run/p3* . ) + ln -sf ../../run/RRTM_DATA . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -437,13 +431,11 @@ em_convrad : wrf ( cd test/em_convrad ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) ( cd test/em_convrad ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ ln -sf ../../run/LANDUSE.TBL . ; \ - ln -sf ../../run/RRTM_DATA . ; \ ln -sf ../../run/RRTMG_LW_DATA . ; \ ln -sf ../../run/RRTMG_SW_DATA . ; \ ln -sf ../../run/ozone.formatted . ; \ ln -sf ../../run/ozone_lat.formatted . ; \ - ln -sf ../../run/ozone_plev.formatted . ; \ - ln -sf ../../run/p3* . ) + ln -sf ../../run/ozone_plev.formatted . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -460,9 +452,7 @@ em_tropical_cyclone : wrf ( cd test/em_tropical_cyclone ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_tropical_cyclone ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) ( cd test/em_tropical_cyclone ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ - ln -sf ../../run/LANDUSE.TBL . ; \ - ln -sf ../../run/RRTM_DATA . ; \ - ln -sf ../../run/p3* . ) + ln -sf ../../run/LANDUSE.TBL . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ @@ -496,12 +486,11 @@ em_scm_xy : wrf ( cd test/em_scm_xy ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_scm_xy ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) ( cd test/em_scm_xy ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ; \ + ln -sf ../../run/GENPARM.TBL . ; \ ln -sf ../../run/LANDUSE.TBL . ; \ - ln -sf ../../run/VEGPARM.TBL . ; \ ln -sf ../../run/SOILPARM.TBL . ; \ - ln -sf ../../run/GENPARM.TBL . ; \ - ln -sf ../../run/RRTM_DATA . ; \ - ln -sf ../../run/p3* . ) + ln -sf ../../run/VEGPARM.TBL . ; \ + ln -sf ../../run/RRTM_DATA . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \ From f37759d966482add04508c6991c2e1be26009a8b Mon Sep 17 00:00:00 2001 From: Kelly Werner Date: Thu, 18 Feb 2021 14:45:09 -0700 Subject: [PATCH 3/3] Update Makefile --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index fa8bd50731..6ba0b25c34 100644 --- a/Makefile +++ b/Makefile @@ -330,7 +330,7 @@ em_b_wave : wrf ( cd main ; $(MAKE) RLFLAGS="$(RLFLAGS)" MODULE_DIRS="$(ALL_MODULES)" SOLVER=em IDEAL_CASE=ideal em_ideal ) ( cd test/em_b_wave ; /bin/rm -f wrf.exe ; ln -s ../../main/wrf.exe . ) ( cd test/em_b_wave ; /bin/rm -f ideal.exe ; ln -s ../../main/ideal.exe . ) - ( cd test/em_b_wave ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) + ( cd test/em_b_wave ; /bin/rm -f README.namelist ; ln -s ../../run/README.namelist . ) ( cd run ; /bin/rm -f ideal.exe ; ln -s ../main/ideal.exe . ) ( cd run ; if test -f namelist.input ; then \ /bin/cp -f namelist.input namelist.input.backup.`date +%Y-%m-%d_%H_%M_%S` ; fi ; \