Adding CALIPSO-OPAQ new diagnostics and GROUND LIDAR + ATLID simulators

build/Makefile

@@ -26,7 +26,7 @@ VPATH += $(DRIVER)
 # Makefile.conf needs to define $(F90), $(F90FLAGS), $(NC_LIB), $(NC_INC)
 include Makefile.conf
 F90FLAGS += $(NC_INC)
-LDFLAGS  += $(NC_LIB) -lnetcdff -lnetcdf
+LDFLAGS  += $(NC_LIB) -lnetcdff
 
 LDFLAGS += -L. -lcosp -lsubcol
 
@@ -43,15 +43,11 @@ LDFLAGS += -L. -lcosp -lsubcol
 #
 # The COSP library
 #
-COSP_OBJS = cosp.o cosp_config.o cosp_stats.o \
-       cosp_constants.o cosp_errorHandling.o cosp_kinds.o \
-       cosp_isccp_interface.o    icarus.o	\
-			 cosp_misr_interface.o     MISR_simulator.o \
-			 cosp_modis_interface.o    modis_simulator.o \
-			 cosp_parasol_interface.o  parasol.o \
-			 cosp_calipso_interface.o  lidar_simulator.o \
-			 cosp_cloudsat_interface.o quickbeam.o \
-			 cosp_rttov_interfaceSTUB.o cosp_rttovSTUB.o
+COSP_OBJS = cosp.o cosp_config.o cosp_stats.o cosp_constants.o cosp_errorHandling.o cosp_kinds.o \
+            cosp_isccp_interface.o icarus.o cosp_misr_interface.o MISR_simulator.o               \
+            cosp_modis_interface.o  modis_simulator.o cosp_parasol_interface.o  parasol.o        \
+            cosp_calipso_interface.o  lidar_simulator.o cosp_cloudsat_interface.o quickbeam.o    \
+            cosp_rttov_interfaceSTUB.o cosp_rttovSTUB.o cosp_grLidar532_interface.o cosp_atlid_interface.o
 
 LIBRARY = libcosp.a
 
@@ -74,29 +70,31 @@ driver_COSP1.4:
 	mv cosp1_test ../driver/run
 
 # Dependencies for libary
-cosp.o                    : cosp_kinds.o cosp_modis_interface.o cosp_constants.o \
-                            cosp_rttov_interfaceSTUB.o cosp_misr_interface.o cosp_isccp_interface.o \
-                            cosp_calipso_interface.o cosp_cloudsat_interface.o cosp_stats.o         \
-	                    cosp_parasol_interface.o cosp_rttovSTUB.o cosp_rttov_interfaceSTUB.o    \
-                            quickbeam.o MISR_simulator.o lidar_simulator.o parasol.o icarus.o
-cosp_constants.o          : cosp_kinds.o
-cosp_config.o             : cosp_kinds.o
-cosp_errorHandling.o      : cosp_kinds.o
-cosp_stats.o              : cosp_kinds.o cosp_config.o
-cosp_isccp_interface.o    : cosp_kinds.o icarus.o
-icarus.o	          : cosp_kinds.o cosp_constants.o  cosp_stats.o
-cosp_misr_interface.o     : cosp_kinds.o
-MISR_simulator.o          : cosp_kinds.o cosp_config.o cosp_stats.o
-cosp_modis_interface.o    : cosp_kinds.o cosp_config.o modis_simulator.o
-modis_simulator.o         : cosp_kinds.o cosp_config.o cosp_stats.o
-cosp_parasol_interface.o  : cosp_kinds.o
-parasol.o                 : cosp_kinds.o cosp_config.o cosp_constants.o
-cosp_calipso_interface.o  : cosp_kinds.o lidar_simulator.o
-lidar_simulator.o         : cosp_kinds.o cosp_config.o cosp_stats.o
-cosp_cloudsat_interface.o : cosp_kinds.o cosp_config.o quickbeam.o
-quickbeam.o               : cosp_kinds.o cosp_stats.o
-cosp_rttov_interfaceSTUB.o: cosp_kinds.o cosp_config.o cosp_rttovSTUB.o
-cosp_rttovSTUB.o          : cosp_kinds.o cosp_config.o cosp_constants.o
+cosp.o : cosp_kinds.o cosp_modis_interface.o cosp_constants.o  cosp_rttov_interfaceSTUB.o \
+	cosp_misr_interface.o cosp_isccp_interface.o cosp_calipso_interface.o             \
+	cosp_cloudsat_interface.o  cosp_stats.o cosp_parasol_interface.o cosp_rttovSTUB.o \
+        cosp_rttov_interfaceSTUB.o quickbeam.o MISR_simulator.o lidar_simulator.o         \
+        parasol.o icarus.o cosp_grLidar532_interface.o cosp_atlid_interface.o
+cosp_constants.o            : cosp_kinds.o
+cosp_config.o               : cosp_kinds.o
+cosp_errorHandling.o        : cosp_kinds.o
+cosp_stats.o                : cosp_kinds.o cosp_config.o
+cosp_isccp_interface.o      : cosp_kinds.o icarus.o
+icarus.o	            : cosp_kinds.o cosp_constants.o  cosp_stats.o
+cosp_misr_interface.o       : cosp_kinds.o
+MISR_simulator.o            : cosp_kinds.o cosp_config.o cosp_stats.o
+cosp_modis_interface.o      : cosp_kinds.o cosp_config.o modis_simulator.o
+modis_simulator.o           : cosp_kinds.o cosp_config.o cosp_stats.o
+cosp_parasol_interface.o    : cosp_kinds.o
+parasol.o                   : cosp_kinds.o cosp_config.o cosp_constants.o
+cosp_calipso_interface.o    : cosp_kinds.o lidar_simulator.o
+lidar_simulator.o           : cosp_kinds.o cosp_config.o cosp_stats.o
+cosp_grLidar532_interface.o : cosp_kinds.o 
+cosp_atlid_interface.o      : cosp_kinds.o 
+cosp_cloudsat_interface.o   : cosp_kinds.o cosp_config.o quickbeam.o
+quickbeam.o                 : cosp_kinds.o cosp_stats.o
+cosp_rttov_interfaceSTUB.o  : cosp_kinds.o cosp_config.o cosp_rttovSTUB.o
+cosp_rttovSTUB.o            : cosp_kinds.o cosp_config.o cosp_constants.o
 
 # Example subcolumn generaton and mapping to optical properties, following COSP 1.4
 SUBCOL_OBJS = mo_rng.o scops.o prec_scops.o cosp_utils.o cosp_optics.o quickbeam_optics.o array_lib.o math_lib.o mrgrnk.o optics_lib.o cosp_errorHandling.o

build/Makefile.conf

@@ -1,6 +1,9 @@
 F90      = ifort
 F90FLAGS = -O3
 
-F90_LIB     = /usr/local/ifort
+#F90_LIB     = /usr/local/ifort
+F90_LIB     = /homedata/gcesana/local/ifort
 NC_INC      = -I$(F90_LIB)/include
-NC_LIB      = -L$(F90_LIB)/lib
+NC_LIB      = -L$(F90_LIB)/lib
+NCDF_INC    = /opt/netcdf43/ifort/include
+NCDF_LIB    = /opt/netcdf43/ifort/lib

driver/run/cosp2_output_nl.txt

@@ -58,6 +58,41 @@
   Lcllcalipsoun=.true.,
   Lclmcalipsoun=.true.,
   Lcltcalipsoun=.true.,
+  ! CALIPSO OPAQ diagnostics
+  Lclopaquecalipso=.true.,
+  Lclthincalipso=.true., 
+  Lclzopaquecalipso=.true.,
+  Lclcalipsoopaque=.true., 
+  Lclcalipsothin=.true.,  
+  Lclcalipsozopaque=.true.,
+  Lclcalipsoopacity=.true., 
+  Lclopaquetemp=.true., 
+  Lclthintemp=.true., 
+  Lclzopaquetemp=.true., 
+  Lclopaquemeanz=.true., 
+  Lclthinmeanz=.true., 
+  Lclthinemis=.true., 
+  Lclopaquemeanzse=.true.,
+  Lclthinmeanzse=.true., 
+  Lclzopaquecalipsose=.true.,
+  ! GROUND LIDAR diagnostics  
+  LlidarBetaMol532gr=.true.,  
+  LcfadLidarsr532gr=.true.,  
+  Latb532gr=.true.,  
+  LclgrLidar532=.true.,
+  LclhgrLidar532=.true.,  
+  LcllgrLidar532=.true., 
+  LclmgrLidar532=.true.,
+  LcltgrLidar532=.true.,
+  ! ATLID diagnostics
+  LlidarBetaMol355=.true.,
+  LcfadLidarsr355=.true., 
+  Latb355=.true., 
+  Lclatlid=.true., 
+  Lclhatlid=.true., 
+  Lcllatlid=.true.,
+  Lclmatlid=.true.,
+  Lcltatlid=.true.,
   !- ISCCP
   Lalbisccp=.true.,
   Lboxptopisccp=.true.,