Skip to content

Commit

Permalink
develop: cleanup, remove legacy code, minor bugfixes (#190)
Browse files Browse the repository at this point in the history 
* Chnage default tasks per node on Orion. Cleanup tests configuration files.
* Delete old Theia job card templates
* Remove NAM physics switches from conf/configure.fv3.*, remove endeavor.intel build config, remove tests/rt_cheyenne.conf
* modulefiles/orion.intel/fv3: bugfix, remove old post-intel-sandybridge/8.0.5 module
* Update tests/rt.conf: add cheyenne, remove unnecessary COMPILE lines, rearrange tests
* conf/configure.fv3.orion.intel: remove legacy CCPP-STATIC switches

Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
  • Loading branch information
@climbfuji @DusanJovic-NOAA
climbfuji and DusanJovic-NOAA authored Aug 26, 2020
1 parent 2e0dc94 commit 1e4edf0
Show file tree
Hide file tree
Showing 161 changed files with 1,389 additions and 1,848 deletions.
4 changes: 0 additions & 4 deletions conf/configure.fv3.cheyenne.gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,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
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,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
211 changes: 0 additions & 211 deletions conf/configure.fv3.endeavor.intel
View file

This file was deleted.

4 changes: 0 additions & 4 deletions conf/configure.fv3.gaea.intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,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.gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,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.hera.intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,10 +73,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
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.linux.gnu
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,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
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,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
10 changes: 0 additions & 10 deletions conf/configure.fv3.orion.intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ OPENMP = Y
AVX2 = Y
HYDRO = N
CCPP = N
STATIC = N
QUAD_PRECISION = Y
MULTI_GASES = N

Expand Down Expand Up @@ -73,10 +72,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 Expand Up @@ -176,12 +171,7 @@ ifeq ($(CCPP),Y)
CPPDEFS += -DCCPP
CFLAGS += -I$(PATH_CCPP)/include
FFLAGS += -I$(PATH_CCPP)/include
ifeq ($(STATIC),Y)
CPPDEFS += -DSTATIC
LDFLAGS += -L$(PATH_CCPP)/lib -lccppphys -lccpp $(NCEPLIBS) -lxml2
else
LDFLAGS += -L$(PATH_CCPP)/lib -lccpp
endif
endif

LDFLAGS += $(LIBS)
Expand Down
4 changes: 0 additions & 4 deletions conf/configure.fv3.s4.intel
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,10 +81,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.stampede.intel
View file
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
Loading

0 comments on commit 1e4edf0

Please sign in to comment.