Removing COSP 1.4 interface

Author: RobertPincus

README.md

@@ -26,7 +26,6 @@ The repository include directories
 - `src/` contains the COSP layer and the underlying satellite simulators
 - `model-interface/` contains routines used by COSP to couple to the host model. Edit these before building.
 - `subsample_and_optics_example/` contains an example implementation, following COSP 1, of the routines to map model-derived grid-scale physical properties to the subgrid-scale optical properties needed by COSP.
-- `cosp-1.4-interface/` contains a wrapper mapping the calling structure and arguments from COSP 1 to COSP 2, making it possible to call COSP 2 using COSP 1 arguments.
 - `driver/` contains codes that run COSP on example inputs and scripts that compare the current implementation to a reference.
 - `build/` contains a Makefile describing build dependencies. Users may build a COSP library and other targets from this Makefile.
 - `unit_testing/` contains small programs meant to exercise some of the simulators.
@@ -42,7 +41,7 @@ The offline drivers read sample snapshots from the Met Office Unified Model, use
  1. Build the drivers.
     1. Edit the files in `model-interface/` if necessary. By default COSP is built using double-precision real variables and printing any error messages to the standard output.
     1. In `build/` edit `Makefile.conf` to reflect the choice of compiler, compiler flags, and library names and locations. If you intend to build the CMOR driver this includes all libraries necessary for CMOR. Building the CMOR driver also requires a change to the definition of the DRIVER variable in Makefile.
-    1. In build `make driver` will build a COSP library, a separate library with the example mapping from model state to COSP inputs, and the `cosp2_test` executable, which is then copied to `driver/run`. `make driver_COSP1.4` is analogous but builds a `cosp1_test` executable that uses the COSP 1.4 calling conventions.
+    1. In build `make driver` will build a COSP library, a separate library with the example mapping from model state to COSP inputs, and the `cosp2_test` executable, which is then copied to `driver/run`.
 
 1. Running the test program
     1. Directory `test/run` contains namelists and other files needed by the test programs. If the executables have been built they should run in this directory using these files as supplied.

build/Makefile

@@ -15,10 +15,6 @@ VPATH = $(SRC_PATH):$(HOOKS):$(SIM_PATH):$(RT_PATH):$(RS_PATH):$(CS_PATH):$(ISCC
 SUBCOLS = ../subsample_and_optics_example
 VPATH += $(SUBCOLS)/optics:$(SUBCOLS)/optics/quickbeam_optics:$(SUBCOLS)/subcol:$(SUBCOLS)/subcol/rng
 
-# COSP1.4 wrapper around COSP2
-COSP1WRAPPER = ../cosp-1.4-interface
-VPATH += $(COSP1WRAPPER)
-
 # Standalone driver
 DRIVER = ../driver/src
 VPATH += $(DRIVER)
@@ -65,9 +61,6 @@ clean:
 driver:
 	make cosp2_test
 	mv cosp2_test ../driver/run
-driver_COSP1.4:
-	make cosp1_test
-	mv cosp1_test ../driver/run
 
 # Dependencies for libary
 cosp.o : cosp_kinds.o cosp_modis_interface.o cosp_constants.o  cosp_rttov_interfaceSTUB.o \
@@ -90,8 +83,8 @@ 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_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
@@ -117,9 +110,3 @@ mo_rng.o     : cosp_kinds.o
 cosp2_io.o    : cosp_kinds.o cosp_config.o cosp.o
 cosp2_test.o  : cosp2_io.o libcosp.a libsubcol.a
 cosp2_test    : cosp2_test.o cosp2_io.o
-
-# Offline driver using COSP 1.4 interface
-cosp_interface_v1p4.o : cosp_kinds.o libcosp.a libsubcol.a
-cosp1_io.o    : cosp_kinds.o cosp_config.o cosp.o cosp_interface_v1p4.o
-cosp1_test.o  : cosp1_io.o
-cosp1_test    : cosp1_test.o cosp1_io.o cosp_interface_v1p4.o