add switch for using/not using flight altitude: this will help us merge with the master branch

modules/deeplearning/icing_cnn.py

@@ -2,13 +2,14 @@ import tensorflow as tf
 import tensorflow_addons as tfa
 from util.setup import logdir, modeldir, cachepath, now
 from util.util import homedir, EarlyStop, normalize, make_for_full_domain_predict
-from util.geos_nav import GEOSNavigation, get_navigation
+from util.geos_nav import get_navigation
 
 import os, datetime
 import numpy as np
 import pickle
 import h5py
 
+USE_FLIGHT_ALTITUDE = True
 
 LOG_DEVICE_PLACEMENT = False
 
@@ -910,7 +911,8 @@ class IcingIntensityNN:
         # flat = tf.keras.layers.concatenate([flat, flat_1d, flat_anc])
         # flat = tf.keras.layers.concatenate([flat, flat_1d])
         # self.build_dnn(flat)
-        flat = tf.keras.layers.concatenate([flat, self.inputs[1]])
+        if USE_FLIGHT_ALTITUDE:
+            flat = tf.keras.layers.concatenate([flat, self.inputs[1]])
         self.build_dnn(flat)
         self.model = tf.keras.Model(self.inputs, self.logits)