Skip to content

Commit

Permalink
Simplify change set
Browse files Browse the repository at this point in the history
  • Loading branch information
jwallwork23 committed Aug 15, 2024
1 parent 2283165 commit 53694dc
Show file tree
Hide file tree
Showing 9 changed files with 296 additions and 297 deletions.
1 change: 0 additions & 1 deletion config/rules.mk
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,6 @@ ifeq ($(FVCUBED),YES)
LIBS += -L$(FVCUBED_ROOT)/$(MACHINE)/lib -lMAPL_cfio -lMAPL_Base -lFVdycoreCubed_GridComp -lfvdycore -lGMAO_mpeu
# this extra -lesmf would not be needed if the ESMF stuff came after this section
LIBS += $(ESMFLIBDIR)/libesmf.a

ifdef NETCDFHOME
NETCDFLIB ?= -L$(NETCDFHOME)/lib -lnetcdf
LIBS += $(subst ",,$(NETCDFLIB))
Expand Down
580 changes: 291 additions & 289 deletions model/CHEM_DRV.F90

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion model/CLOUDS_COM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ module CLOUDS_COM
pflcu, & ! Downward flux of convective liq precipitation [kg/m2/s]
pfilsan, & ! Downward flux of large-scale ice precipitation [kg/m2/s]
pfllsan ! Downward flux of large-scale liq precipitation [kg/m2/s]
integer LMIN
integer LMIN
#endif
!@var CLDMC moist convective cloud cover area (percent)
real*8, allocatable, dimension(:,:,:) :: CLDMC
Expand Down
2 changes: 1 addition & 1 deletion model/RAD_COM.f
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ SUBROUTINE ALLOC_RAD_COM(grid)
* COSZ1 (I_0H:I_1H, J_0H:J_1H),
#ifdef TRACERS_GC
* save_COSZ2(I_0H:I_1H, J_0H:J_1H),
#endif
#endif
* COSZ_day(I_0H:I_1H, J_0H:J_1H),
* SUNSET (I_0H:I_1H, J_0H:J_1H),
#ifdef CUBED_SPHERE
Expand Down
2 changes: 1 addition & 1 deletion model/RAD_DRV.f
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ SUBROUTINE init_RAD(istart)
use clouds_com, only : svlhx,svlat,rhsav
#ifdef GCAP
use rad_com, only : save_cosz2
#endif
#endif
!use clouds_com, only : lmid,lhi
! end section for radiation-only SCM
IMPLICIT NONE
Expand Down
2 changes: 0 additions & 2 deletions model/SUBDD.f
Original file line number Diff line number Diff line change
Expand Up @@ -1774,12 +1774,10 @@ subroutine parse_subdd
call tijph_defs(diaglists(1,k),nmax_possible,diaglens(k))
#endif
#ifdef TRACERS_GC
k = k + 1
catshapes(k) = 'aijlh'; categories(k) = 'taijlh'
input_sizes3(k) = lm
call tijlh_defs(diaglists(1,k),nmax_possible,diaglens(k))
#endif
#ifdef TRACERS_GC
Expand Down
Binary file modified model/geos-chem/gcclassic
Binary file not shown.
2 changes: 1 addition & 1 deletion model/geos-chem/src/GEOS-Chem
2 changes: 1 addition & 1 deletion model/geos-chem/src/HEMCO

0 comments on commit 53694dc

Please sign in to comment.