Merge pull request #9 from nichollsh/hn/2407

Version 2407 with some changes
nichollsh · Oct 29, 2024 · a6807e6 · a6807e6
2 parents 4d7ec2a + 15b2d75
commit a6807e6
Show file tree

Hide file tree

Showing 146 changed files with 3,208 additions and 381,694 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -1,9 +1,10 @@
 name: Compile SOCRATES
 
 on:
+  pull_request:
+    branches: [main]
   push:
-    branches: 
-      - main
+    branches: [main]
 
 jobs:
   install:

diff --git a/data/gases/ref_pt b/data/gases/ref_pt
@@ -1,5 +1,5 @@
-*REF 1 300 1 1.0e5 275.0
-*REF 1 300 3 1.0e2 240.0
-*REF 1 300 9 1.0e2 240.0
-*REF 1 300 16 1.0e2 253.0
+*REF 1 5000 1 1.0e5 275.0
+*REF 1 5000 3 1.0e2 240.0
+*REF 1 5000 9 1.0e2 240.0
+*REF 1 5000 16 1.0e2 253.0
 *END
diff --git a/data/spectra/ga7_solar_var/sp_sw_ga7_cmip6_picontrol b/data/spectra/ga7_solar_var/sp_sw_ga7_cmip6_picontrol
diff --git a/data/spectra/ga7_solar_var/sp_sw_ga7_cmip6_ref_mon b/data/spectra/ga7_solar_var/sp_sw_ga7_cmip6_ref_mon
diff --git a/docs/socrates_techguide.pdf b/docs/socrates_techguide.pdf
diff --git a/docs/socrates_userguide.pdf b/docs/socrates_userguide.pdf
diff --git a/examples/mars/env_mars b/examples/mars/env_mars
@@ -1,7 +1,7 @@
 # Environment variables for Mars spectral files
 
 # Met Office
-ARCHIVE_DATA="/local/scratch/nichollsh/mars_lbl_test/"
+ARCHIVE_DATA="/spice/project/radiation/socrates"
 
 # UoE
 # ARCHIVE_DATA="/data/jm606/socrates"

diff --git a/examples/mars/mk_h2o_lbl_lw_400_jm_mars b/examples/mars/mk_h2o_lbl_lw_400_jm_mars
@@ -8,12 +8,12 @@ else
 fi
 
 # Set environment variables
-procs=80
+procs=24
 . ./env_mars
 
 # HITRAN2020 data downloaded from hitran.org on 11.11.22
 # (No CO2 broadening coefficients are available for H2O.)
-HITRAN_H2O="/home/n/nichollsh/SOCRATES/nogit_HITRAN2020/h2o_data.par"
+HITRAN_H2O="${ARCHIVE_DATA}/HITRAN2020/h2o_111122.par"
 
 # CAVIAR foreign-broadened continuum
 CONT_H2O_FRN="${RAD_DATA}/continua/caviar_frn"
@@ -24,7 +24,6 @@ skelfile="${LW_DATA}/sp_lw_400_jm_mars_skel"
 ./mk_sp_lw_400_jm_mars_skel $skelfile > /dev/null
 
 lbl_base=${H2O_LBL_LWF%.nc}
-echo $lbl_base
 if [ ! -s ${lbl_base}.nc ] || [ ! -f ${lbl_base}.done ] ; then
   echo "Generating H2O line + foreign continuum absorption data: IR"
   rm -f ${lbl_base}*

diff --git a/examples/mars/mk_sp_lw_400_jm_mars b/examples/mars/mk_sp_lw_400_jm_mars
@@ -57,51 +57,51 @@ if [ ! -s $sp_dir/h2o-h2o_lw_c ] ; then
      > $sp_dir/h2o-h2o_lw_clog
 fi
 
-# echo -n 'CO2 '
-# if [ ! -s $sp_dir/co2_lw_l ] ; then
-#   if [ ! -s $CO2_LBL_LW ] ; then
-#     echo ": No LBL file: please run ./mk_co2_lbl_lw_400_jm_mars"
-#     exit 1
-#   else
-#     rm -f $sp_dir/co2_lw_l*
-#     Ccorr_k -F ${GAS_DATA_DIR}/${PT_FILE} \
-#       -R 1 400 -l 2 ${COL_MASS_K_CO2} -b 5.0e-4 \
-#       -sb ${GAS_DATA_DIR}/gas_fractions_09_10 -lp 2 \
-#       -s $skelfile +p -lk \
-#       -o $sp_dir/co2_lw_l -m $sp_dir/co2_lw_lm \
-#       -L $CO2_LBL_LW \
-#        > $sp_dir/co2_lw_log
-#   fi
-# fi
-# echo 'done'
-
-# if [ ! -s $sp_dir/co2-co2_lw_c ] ; then
-#   echo "CO2-CO2 CIA"
-#   rm -f $sp_dir/co2-co2_lw_c*
-#   Ccorr_k -F $CONT_PT_FILE -CIA $CONT_CO2_CO2 \
-#     -R 1 400 -i 1.0 -ct 2 2 ${COL_CO2C} -t 5.0e-4 \
-#     -k -s $skelfile +p -lk \
-#     -o $sp_dir/co2-co2_lw_c -m $sp_dir/co2-co2_lw_cm \
-#     -L $sp_dir/co2-co2_lw_clbl.nc \
-#     -np $procs > $sp_dir/co2-co2_lw_clog
-# fi
-
-# echo -n 'SO2 '
-# if [ ! -s $sp_dir/so2_lw_l ] ; then
-#   if [ ! -s $SO2_LBL_LW ] ; then
-#     echo ": No LBL file: please run ./mk_so2_lbl_lw_400_jm_mars"
-#     exit 1
-#   else
-#     rm -f $sp_dir/so2_lw_l*
-#     Ccorr_k -F ${GAS_DATA_DIR}/${PT_FILE} \
-#       -R 1 400 -l 9 ${COL_MASS_K_SO2} -b 5.0e-4 \
-#       -s $skelfile +p -lk \
-#       -o $sp_dir/so2_lw_l -m $sp_dir/so2_lw_lm \
-#       -L $SO2_LBL_LW \
-#        > $sp_dir/so2_lw_log
-#   fi
-# fi
-# echo 'done'
+echo -n 'CO2 '
+if [ ! -s $sp_dir/co2_lw_l ] ; then
+  if [ ! -s $CO2_LBL_LW ] ; then
+    echo ": No LBL file: please run ./mk_co2_lbl_lw_400_jm_mars"
+    exit 1
+  else
+    rm -f $sp_dir/co2_lw_l*
+    Ccorr_k -F ${GAS_DATA_DIR}/${PT_FILE} \
+      -R 1 400 -l 2 ${COL_MASS_K_CO2} -b 5.0e-4 \
+      -sb ${GAS_DATA_DIR}/gas_fractions_09_10 -lp 2 \
+      -s $skelfile +p -lk \
+      -o $sp_dir/co2_lw_l -m $sp_dir/co2_lw_lm \
+      -L $CO2_LBL_LW \
+       > $sp_dir/co2_lw_log
+  fi
+fi
+echo 'done'
+
+if [ ! -s $sp_dir/co2-co2_lw_c ] ; then
+  echo "CO2-CO2 CIA"
+  rm -f $sp_dir/co2-co2_lw_c*
+  Ccorr_k -F $CONT_PT_FILE -CIA $CONT_CO2_CO2 \
+    -R 1 400 -i 1.0 -ct 2 2 ${COL_CO2C} -t 5.0e-4 \
+    -k -s $skelfile +p -lk \
+    -o $sp_dir/co2-co2_lw_c -m $sp_dir/co2-co2_lw_cm \
+    -L $sp_dir/co2-co2_lw_clbl.nc \
+    -np $procs > $sp_dir/co2-co2_lw_clog
+fi
+
+echo -n 'SO2 '
+if [ ! -s $sp_dir/so2_lw_l ] ; then
+  if [ ! -s $SO2_LBL_LW ] ; then
+    echo ": No LBL file: please run ./mk_so2_lbl_lw_400_jm_mars"
+    exit 1
+  else
+    rm -f $sp_dir/so2_lw_l*
+    Ccorr_k -F ${GAS_DATA_DIR}/${PT_FILE} \
+      -R 1 400 -l 9 ${COL_MASS_K_SO2} -b 5.0e-4 \
+      -s $skelfile +p -lk \
+      -o $sp_dir/so2_lw_l -m $sp_dir/so2_lw_lm \
+      -L $SO2_LBL_LW \
+       > $sp_dir/so2_lw_log
+  fi
+fi
+echo 'done'
 
 
 # Sulphuric acid aerosol

diff --git a/examples/netcdf/CIRC_case6/ref_case6_lw_hadgem1_3.hrts b/examples/netcdf/CIRC_case6/ref_case6_lw_hadgem1_3.hrts
diff --git a/examples/netcdf/CIRC_case6/ref_case6_sw_hadgem1_3r.hrts b/examples/netcdf/CIRC_case6/ref_case6_sw_hadgem1_3r.hrts
diff --git a/examples/netcdf/mcica/ref_lw_avg.hrts b/examples/netcdf/mcica/ref_lw_avg.hrts
@@ -37,18 +37,18 @@ data:
                      0.649350E+05, 0.689971E+05, 0.732344E+05, 0.775696E+05,
                      0.818327E+05, 0.857757E+05, 0.891779E+05, 0.919747E+05,
                      0.942821E+05, 0.963030E+05, 0.982111E+05, 0.100101E+06;
-             hrts = -0.799146E+01,-0.265109E+01,-0.934486E+01,-0.801987E+01,
-                    -0.572642E+01,-0.377881E+01,-0.232480E+01,-0.148515E+01,
-                    -0.913476E+00,-0.777131E+00,-0.632945E+00,-0.393369E+00,
-                    -0.192541E+00,-0.411983E+00, 0.214833E+00, 0.412944E+00,
-                     0.380288E+00, 0.269172E+00, 0.638707E-01,-0.260642E+00,
-                    -0.684665E+00,-0.109739E+01,-0.188444E+01,-0.171625E+01,
-                    -0.163910E+01,-0.184570E+01,-0.202784E+01,-0.220422E+01,
-                    -0.224261E+01,-0.231318E+01,-0.228461E+01,-0.214646E+01,
-                    -0.194422E+01,-0.174269E+01,-0.160312E+01,-0.173717E+01,
-                    -0.213285E+01,-0.306006E+01,-0.310471E+01,-0.265921E+01,
-                    -0.225698E+01,-0.204953E+01,-0.212299E+01,-0.256296E+01,
-                    -0.267624E+01,-0.206777E+01,-0.405765E+01,-0.174774E+01,
-                    -0.201234E+01,-0.153695E+01,-0.174840E+01,-0.722196E+00;
+             hrts = -0.799146E+01,-0.265112E+01,-0.934615E+01,-0.802111E+01,
+                    -0.572694E+01,-0.377909E+01,-0.232504E+01,-0.148535E+01,
+                    -0.913803E+00,-0.777414E+00,-0.633110E+00,-0.393416E+00,
+                    -0.192542E+00,-0.411925E+00, 0.214932E+00, 0.412982E+00,
+                     0.380160E+00, 0.268840E+00, 0.634487E-01,-0.261120E+00,
+                    -0.685139E+00,-0.109781E+01,-0.188489E+01,-0.171688E+01,
+                    -0.163989E+01,-0.184666E+01,-0.202905E+01,-0.220593E+01,
+                    -0.224520E+01,-0.231703E+01,-0.228891E+01,-0.214937E+01,
+                    -0.194529E+01,-0.174269E+01,-0.160205E+01,-0.173712E+01,
+                    -0.213369E+01,-0.306266E+01,-0.310437E+01,-0.265690E+01,
+                    -0.225453E+01,-0.204751E+01,-0.212157E+01,-0.256189E+01,
+                    -0.267474E+01,-0.206641E+01,-0.405337E+01,-0.174623E+01,
+                    -0.201237E+01,-0.154026E+01,-0.176326E+01,-0.726006E+00;
 
 }
diff --git a/examples/netcdf/mcica/ref_lw_ga7.hrts b/examples/netcdf/mcica/ref_lw_ga7.hrts
@@ -0,0 +1,54 @@
+netcdf cdl_lw_ga7.hrts{                                                         
+
+dimensions:
+    lon            =   1;
+    lat            =   1;
+    plev           =  52;
+
+
+variables:
+    float lon(lon);                                                           
+             lon:units = "degree";                                            
+             lon:title = "longitude";                                        
+    float lat(lat);                                                           
+             lat:units = "degree";                                            
+             lat:title = "latitude";                                         
+    float plev(plev);                                                         
+             plev:units = "pa";                                               
+             plev:title = "pressure";                                        
+
+    float hrts(plev,lat,lon);                                                  
+             hrts:units = "k.d-1";                                            
+             hrts:title = "heating rates";                                                   
+
+data:
+              lon =  0.000000E+00;
+              lat =  0.000000E+00;
+             plev =  0.300000E-01, 0.579000E+01, 0.854000E+02, 0.159000E+03,
+                     0.305000E+03, 0.600000E+03, 0.122000E+04, 0.257000E+04,
+                     0.300000E+04, 0.350000E+04, 0.409000E+04, 0.480000E+04,
+                     0.565000E+04, 0.602919E+04, 0.714460E+04, 0.847906E+04,
+                     0.999917E+04, 0.116150E+05, 0.132147E+05, 0.147372E+05,
+                     0.161859E+05, 0.176116E+05, 0.190739E+05, 0.206110E+05,
+                     0.222380E+05, 0.239602E+05, 0.257805E+05, 0.277023E+05,
+                     0.297304E+05, 0.318731E+05, 0.341369E+05, 0.365263E+05,
+                     0.390480E+05, 0.417121E+05, 0.445246E+05, 0.474881E+05,
+                     0.506139E+05, 0.539122E+05, 0.573942E+05, 0.610677E+05,
+                     0.649350E+05, 0.689971E+05, 0.732344E+05, 0.775696E+05,
+                     0.818327E+05, 0.857757E+05, 0.891779E+05, 0.919747E+05,
+                     0.942821E+05, 0.963030E+05, 0.982111E+05, 0.100101E+06;
+             hrts = -0.832216E+01,-0.267715E+01,-0.966223E+01,-0.809949E+01,
+                    -0.554407E+01,-0.368818E+01,-0.229671E+01,-0.152758E+01,
+                    -0.923371E+00,-0.784693E+00,-0.642371E+00,-0.405041E+00,
+                    -0.206151E+00,-0.400131E+00, 0.261248E+00, 0.413106E+00,
+                     0.380362E+00, 0.269372E+00, 0.342784E-01,-0.310603E+00,
+                    -0.682227E+00,-0.100869E+01,-0.169719E+01,-0.156630E+01,
+                    -0.161059E+01,-0.193639E+01,-0.214213E+01,-0.227041E+01,
+                    -0.222493E+01,-0.227662E+01,-0.230184E+01,-0.217361E+01,
+                    -0.195603E+01,-0.176464E+01,-0.164702E+01,-0.180447E+01,
+                    -0.223698E+01,-0.322565E+01,-0.323669E+01,-0.268368E+01,
+                    -0.213247E+01,-0.185843E+01,-0.195170E+01,-0.224559E+01,
+                    -0.325917E+01,-0.205188E+01,-0.301927E+01,-0.191103E+01,
+                    -0.339771E+01,-0.164453E+01,-0.181191E+01,-0.630644E+00;
+
+}