Merge pull request #61 from fetch4/55_debug_take2

Fix minor bugs to enable GISS-only run

.github/rundecks/GISS_GC_14.R

@@ -244,7 +244,7 @@ cloud_rad_forc=1 ! turn on cloud radiative forcing diagnostics
 
 ! diagnostics
 ! SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4' ! TODO: Turn these on
-SUBDD='SAT:6i'
+SUBDD=''
 NSUBDD=1         ! saving sub-daily diags every NSUBDD-th physics timestep
 DAYS_PER_FILE=1
 KCOPY=1          ! save accumulated diagnostics files
@@ -261,6 +261,6 @@ Ndisk=960        ! write fort.1.nc or fort.2.nc every NDISK source timestep
 
 &INPUTZ
  YEARI=2016,MONTHI=7,DATEI=1,HOURI=0,
- YEARE=2016,MONTHE=8,DATEE=1,HOURE=0,     KDIAG=13*0,
- ISTART=2,IRANDI=0, YEARE=2016,MONTHE=7,DATEE=2,HOURE=0,
+ YEARE=2016,MONTHE=7,DATEE=1,HOURE=1,     KDIAG=13*0,
+ ISTART=2,IRANDI=0, YEARE=2016,MONTHE=7,DATEE=1,HOURE=1,
 /

.github/rundecks/GISS_ONLY.R

@@ -233,7 +233,7 @@ cloud_rad_forc=1 ! turn on cloud radiative forcing diagnostics
 
 ! diagnostics
 ! SUBDD='OH:4 NO:4 O3:4 NO2:4 CO:4 CH4:4 PS:4' ! TODO: Turn these on
-SUBDD='SAT:6i'
+SUBDD=''
 NSUBDD=1         ! saving sub-daily diags every NSUBDD-th physics timestep
 DAYS_PER_FILE=1
 KCOPY=1          ! save accumulated diagnostics files
@@ -250,6 +250,6 @@ Ndisk=960        ! write fort.1.nc or fort.2.nc every NDISK source timestep
 
 &INPUTZ
  YEARI=2016,MONTHI=7,DATEI=1,HOURI=0,
- YEARE=2016,MONTHE=8,DATEE=1,HOURE=0,     KDIAG=13*0,
- ISTART=2,IRANDI=0, YEARE=2016,MONTHE=7,DATEE=2,HOURE=0,
+ YEARE=2016,MONTHE=7,DATEE=1,HOURE=1,     KDIAG=13*0,
+ ISTART=2,IRANDI=0, YEARE=2016,MONTHE=7,DATEE=1,HOURE=1,
 /

.github/workflows/test_suite.yml

@@ -22,7 +22,7 @@ env:
   # Misc. environment variables
   F_UFMTENDIAN: big
   KMP_STACKSIZE: 100000000
-  OMP_NUM_THREADS: 36
+  OMP_NUM_THREADS: 1
 
 jobs:
   # Test that GISS-GC can be compiled without error

model/CLOUDS2.F90

@@ -429,7 +429,7 @@ module CLOUDS
   ! 4 = downdraft mass flux
   ! 5 = downdraft entrain
   ! 6 = downdraft detrain
-  real*8 :: dZ(LM), dZm(LM+1)
+  real*8 :: dZ(LM), dZm(LM)
 #endif
 #endif
 
@@ -940,8 +940,8 @@ subroutine MSTCNV(IERR,LERR,i_debug,j_debug)
     ! Calculate distance layer midpoints [m] (with special treatment at surface) for
     ! precipitation flux calculation
     dZm(1) = 0.5 * dZ(1)
-    DO L=2,LM+1
-    dZm(L) = 0.5 * ( dZm(L-1) + dZm(L) )
+    DO L=2,LM
+    dZm(L) = 0.5 * ( dZ(L-1) + dZ(L) )
     ENDDO 
     ! Calculate inverse mass in each layer (1/kg)
     DO L=1,LM

model/MPI_Support/gs_setup.inc

@@ -136,6 +136,8 @@ c calculate gatherv/scatterv info
 #endif
       if (.not. allocated(cntsij)) allocate(cntsij(1))
       if (.not. allocated(displsij)) allocate(displsij(1))
+      if (.not. allocated(cntslij)) allocate(cntslij(1))
+      if (.not. allocated(displslij)) allocate(displslij(1))
 
 #ifdef _GATHER_
 c

model/lightning.f

@@ -462,6 +462,8 @@ subroutine calc_lightning(i,j,lmax,lfrz,mflux,precon)
          flash = flash * FLASH_PERTURB
          cg    = cg    * FLASH_PERTURB
 
+      else
+        htcon = 0.0
       end if
 
       !===============================================