Skip to content

Remove unused and unsupported code #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
DusanJovic-NOAA merged 4 commits into from
Dec 23, 2019
Merged

Remove unused and unsupported code #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c2d3fcc
update FV3 submodule to track DusanJovic-NOAA/fv3atm
DusanJovic-NOAA Dec 19, 2019
f02d4d4
remove support for theia and namphysics
DusanJovic-NOAA Dec 19, 2019
004b009
remove release/v0 directory
DusanJovic-NOAA Dec 19, 2019
de17577
Update FV3 submodule
DusanJovic-NOAA Dec 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion FV3
Open in desktop
Submodule FV3 updated from 2bd04f to b48b64
142 changes: 0 additions & 142 deletions compsets/fv3.input
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,24 +159,6 @@ build fv3_appbuilder.exe {
OPTS="app=standaloneFV3",md5sum="@[md5sum]")
}

build fv3_NAM_phys.exe {
# This block builds the FV3 with NAM physics. It is otherwise
# identical to the fv3.exe block.
use plat

# Note:
# plat%EXECrt = temporary directory for executables and md5 sums
# plat%INCrt = temporary directory for modulefiles
target="@[plat%EXECrt]/fv3_NAM_phys.exe" # NEMS.x installation location
modules.nems="@[plat%INCrt]/modules.fv3_nam" # modulefile for this NEMS.x
md5sum="@[target].md5" # MD5SUM for this NEMS.x

# build: script to build the NEMS.x. For now, this is an embedded
# bash script.
build=compile.sh(fv3="@[target]",modules="@[modules.nems]",md5="@[md5sum]",
MAKE_OPTS='NAM_phys=Y')
}

build fv3_ww3.exe {
# This block builds the FV3 32 bit coupled with WW3
use plat
Expand Down Expand Up @@ -3388,127 +3370,3 @@ test fv3_csawmg3shoc127: fv3.exe {
{"@[build%target]", ranks="@[TASKS]" }
}
}

########################################################################

test fv3_NAM_phys: fv3_NAM_phys.exe {
use plat
use plat%default_resources
use fv3_defaults

TEST_DESCR="Compare FV3 NAM physics results with previous trunk version"
CNTL_NAME='fv3_NAM_phys'

COM="@[plat%COMrt]/@[TEST_NAME]" # Test result area
RUNDIR="@[plat%TMPrt]/@[TEST_NAME]" # Test work area
CNTL="@[plat%BASELINE]/@[CNTL_NAME]" # Control baseline area
FV3_input_data="@[plat%INPUTS]/FV3_input_data"
FHMAX='12'

# The build variable is the fv3.exe or fv3_appbuild.fv3, which
# provides the path to the build target, md5 sum, and modulefile.
build=fv3_NAM_phys.exe

prep=fv3_prep(
RUNDIR="@[RUNDIR]",modules="@[fv3.exe%modules.nems]",
CNTL="@[CNTL]")

# Specify input files.
filters input {
# WORK FILE <=filter= SOURCE FILE
'input.nml' <=atparse= "@[PARMnems]/NAM_phys.nml.IN"
'model_configure' <=atparse= "@[PARMnems]/model_configure.IN"
'aerosol.dat' <=copyfrom= "@[FV3_input_data]/INPUT"
'co2historicaldata_201*.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'sfc_emissivity_idx.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'solarconstant_noaa_an.txt' <=copyfrom= "@[FV3_input_data]/INPUT"
'*grb' <=copyfrom= "@[FV3_input_data]"
'*_table' <=copyfrom= "@[FV3_input_data]"
'qr_acr_q*' <=copyfrom= "@[FV3_input_data]"
'*.TBL' <=copyfrom= "@[FV3_input_data]"
'DETAMPNEW_DATA*' <=copyfrom= "@[FV3_input_data]"
'diag_table' <=copy= "@[FV3_input_data]/diag_table_NAM_phys"
'field_table' <=copy= "@[FV3_input_data]/field_table_NAM_phys"
'*configure' <=copyfrom= "@[FV3_input_data]"
'INPUT' <=copy= "@[FV3_input_data]/INPUT"
'global_o3prdlos.f77' <=copy= "@[FV3_input_data]/INPUT/global_o3prdlos.f77"
}

# Specify output files:
criteria output {
# WORKFILE .comparison. TARGET
'atmos_4xdaily.tile1.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile2.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile3.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile4.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile5.nc' .bitcmp. "@[CNTL]"
'atmos_4xdaily.tile6.nc' .bitcmp. "@[CNTL]"
'phyf000.tile1.nc' .bitcmp. "@[CNTL]"
'phyf000.tile2.nc' .bitcmp. "@[CNTL]"
'phyf000.tile3.nc' .bitcmp. "@[CNTL]"
'phyf000.tile4.nc' .bitcmp. "@[CNTL]"
'phyf000.tile5.nc' .bitcmp. "@[CNTL]"
'phyf000.tile6.nc' .bitcmp. "@[CNTL]"
'phyf012.tile1.nc' .bitcmp. "@[CNTL]"
'phyf012.tile2.nc' .bitcmp. "@[CNTL]"
'phyf012.tile3.nc' .bitcmp. "@[CNTL]"
'phyf012.tile4.nc' .bitcmp. "@[CNTL]"
'phyf012.tile5.nc' .bitcmp. "@[CNTL]"
'phyf012.tile6.nc' .bitcmp. "@[CNTL]"
'dynf000.tile1.nc' .bitcmp. "@[CNTL]"
'dynf000.tile2.nc' .bitcmp. "@[CNTL]"
'dynf000.tile3.nc' .bitcmp. "@[CNTL]"
'dynf000.tile4.nc' .bitcmp. "@[CNTL]"
'dynf000.tile5.nc' .bitcmp. "@[CNTL]"
'dynf000.tile6.nc' .bitcmp. "@[CNTL]"
'dynf012.tile1.nc' .bitcmp. "@[CNTL]"
'dynf012.tile2.nc' .bitcmp. "@[CNTL]"
'dynf012.tile3.nc' .bitcmp. "@[CNTL]"
'dynf012.tile4.nc' .bitcmp. "@[CNTL]"
'dynf012.tile5.nc' .bitcmp. "@[CNTL]"
'dynf012.tile6.nc' .bitcmp. "@[CNTL]"
'RESTART/coupler.res' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_core.res.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_srf_wnd.res.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/fv_tracer.res.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/phy_data.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile1.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile2.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile3.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile4.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile5.nc' .bitcmp. "@[CNTL]/RESTART/"
'RESTART/sfc_data.tile6.nc' .bitcmp. "@[CNTL]/RESTART/"

# Executable validation. This makes an MD5 sum of the fv3.exe
# for comparison against the MD5 sum made in the build job.
# This is to ensure the executable did not change during the
# test suite.
"@[build%target]" .md5cmp. "@[build%md5sum]"
}

spawn execute {
# Run the
{"@[build%target]", ranks="@[TASKS]" }
}
}
4 changes: 1 addition & 3 deletions conf/before_components.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,7 @@ CONFIGURE_NEMS_FILE=configure.fv3.$(BUILD_TARGET)

# ----------------------------------------------------------------------
# Exit for systems that are currently not supported
ifeq ($(BUILD_TARGET),theia.pgi)
$(error NEMSfv3gfs currently not supported on $(BUILD_TARGET))
else ifeq ($(BUILD_TARGET),cheyenne.pgi)
ifeq ($(BUILD_TARGET),cheyenne.pgi)
$(error NEMSfv3gfs currently not supported on $(BUILD_TARGET))
endif

Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.cheyenne.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS +=
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.cheyenne.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.cheyenne.intel-impi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.cheyenne.pgi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -r4
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.endeavor.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.hera.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.jet.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.linux.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS +=
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.macosx.gnu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,10 +98,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS +=
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.stampede.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.supermuc_phase2.intel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,6 @@ else
CPPDEFS += -DMOIST_CAPPA -DUSE_COND
endif

ifeq ($(NAM_phys),Y)
CPPDEFS += -DNAM_phys
endif

ifeq ($(32BIT),Y)
CPPDEFS += -DOVERLOAD_R4 -DOVERLOAD_R8
FFLAGS += -i4 -real-size 32
Expand Down
Loading