Updated with master

CFMIP · Mar 13, 2018 · 71922d6 · 71922d6
2 parents 0986d28 + 56aee9a
commit 71922d6
Show file tree

Hide file tree

Showing 61 changed files with 1 addition and 1 deletion.
diff --git a/...a/outputs/UKMO/cmor/ref1D/albisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/albisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ata/outputs/UKMO/cmor/ref1D/atb532_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ata/outputs/UKMO/cmor/ref1D/atb532_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/boxptopisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/boxptopisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...utputs/UKMO/cmor/ref1D/boxtauisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...utputs/UKMO/cmor/ref1D/boxtauisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...outputs/UKMO/cmor/ref1D/cfadDbze94_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...outputs/UKMO/cmor/ref1D/cfadDbze94_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...uts/UKMO/cmor/ref1D/cfadLidarsr532_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...uts/UKMO/cmor/ref1D/cfadLidarsr532_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ata/outputs/UKMO/cmor/ref1D/clMISR_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ata/outputs/UKMO/cmor/ref1D/clMISR_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...outputs/UKMO/cmor/ref1D/clcalipso2_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...outputs/UKMO/cmor/ref1D/clcalipso2_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/.../outputs/UKMO/cmor/ref1D/clcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/.../outputs/UKMO/cmor/ref1D/clcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/clcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/clcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/clcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/clcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/clcalipsotmp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/clcalipsotmp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ts/UKMO/cmor/ref1D/clcalipsotmpice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ts/UKMO/cmor/ref1D/clcalipsotmpice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ts/UKMO/cmor/ref1D/clcalipsotmpliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ts/UKMO/cmor/ref1D/clcalipsotmpliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...uts/UKMO/cmor/ref1D/clcalipsotmpun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...uts/UKMO/cmor/ref1D/clcalipsotmpun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...utputs/UKMO/cmor/ref1D/clcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...utputs/UKMO/cmor/ref1D/clcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...outputs/UKMO/cmor/ref1D/clhcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...outputs/UKMO/cmor/ref1D/clhcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/clhcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/clhcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/clhcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/clhcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/clhcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/clhcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/clhmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/clhmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/climodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/climodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ta/outputs/UKMO/cmor/ref1D/clisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ta/outputs/UKMO/cmor/ref1D/clisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...outputs/UKMO/cmor/ref1D/cllcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...outputs/UKMO/cmor/ref1D/cllcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/cllcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/cllcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/cllcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/cllcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/cllcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/cllcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/cllmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/cllmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...outputs/UKMO/cmor/ref1D/clmcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...outputs/UKMO/cmor/ref1D/clmcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/clmcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/clmcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/clmcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/clmcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/clmcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/clmcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/clmmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/clmmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ta/outputs/UKMO/cmor/ref1D/clmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ta/outputs/UKMO/cmor/ref1D/clmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...outputs/UKMO/cmor/ref1D/cltcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...outputs/UKMO/cmor/ref1D/cltcalipso_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/cltcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/cltcalipsoice_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/cltcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/cltcalipsoliq_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/cltcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/cltcalipsoun_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/cltisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/cltisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...puts/UKMO/cmor/ref1D/cltlidarradar_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...puts/UKMO/cmor/ref1D/cltlidarradar_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/cltmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/cltmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/clwmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/clwmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ata/outputs/UKMO/cmor/ref1D/dbze94_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ata/outputs/UKMO/cmor/ref1D/dbze94_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/iwpmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/iwpmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...ts/UKMO/cmor/ref1D/lidarBetaMol532_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...ts/UKMO/cmor/ref1D/lidarBetaMol532_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/lwpmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/lwpmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...uts/UKMO/cmor/ref1D/meantbclrisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...uts/UKMO/cmor/ref1D/meantbclrisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...utputs/UKMO/cmor/ref1D/meantbisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...utputs/UKMO/cmor/ref1D/meantbisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...utputs/UKMO/cmor/ref1D/parasolRefl_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...utputs/UKMO/cmor/ref1D/parasolRefl_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/pctisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/pctisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/pctmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/pctmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/reffclimodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/reffclimodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/reffclwmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/reffclwmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/tauilogmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/tauilogmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/.../outputs/UKMO/cmor/ref1D/tauimodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/.../outputs/UKMO/cmor/ref1D/tauimodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...a/outputs/UKMO/cmor/ref1D/tauisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...a/outputs/UKMO/cmor/ref1D/tauisccp_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/tautlogmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/tautlogmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/.../outputs/UKMO/cmor/ref1D/tautmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/.../outputs/UKMO/cmor/ref1D/tautmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/...tputs/UKMO/cmor/ref1D/tauwlogmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/...tputs/UKMO/cmor/ref1D/tauwlogmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/.../outputs/UKMO/cmor/ref1D/tauwmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc b/.../outputs/UKMO/cmor/ref1D/tauwmodis_1D_HadGEM2-ES_amip_r1i1p1_200801020000-200801020000.nc
diff --git a/model-interface/cosp_kinds.F90 b/model-interface/cosp_kinds.F90
@@ -34,6 +34,6 @@ MODULE cosp_kinds
   implicit none
   INTEGER, PARAMETER :: sp = SELECTED_REAL_KIND( 6, 37)
   INTEGER, PARAMETER :: dp = SELECTED_REAL_KIND(12,307)
-  INTEGER, PARAMETER :: wp = dp
+  INTEGER, PARAMETER :: wp = sp
 
 END MODULE cosp_kinds