UGWP v0 v1 combined

CMakeLists.txt

@@ -149,6 +149,14 @@ list(APPEND _fms_defs_public use_libMPI
 if(QUAD_PRECISION)
   list(APPEND _fms_defs_public ENABLE_QUAD_PRECISION)
 endif()
+
+# check gettid
+include(CheckFunctionExists)
+check_function_exists(gettid HAVE_GETTID)
+if(HAVE_GETTID)
+  list(APPEND _fms_defs_public HAVE_GETTID)
+endif()
+
 target_compile_definitions(fms PUBLIC "${_fms_defs_public}")
 
 if(32BIT)

tests/ci/ci.sh

@@ -63,8 +63,6 @@ fi
 
 if [ $BUILD = "true" ]; then
 
-  sed -i -e '/affinity.c/d' ../../CMakeLists.txt
-
   sudo docker build --build-arg test_name=$TEST_NAME \
                     --build-arg build_case=$BUILD_CASE \
                     --no-cache \

tests/compare_ncfile.py

@@ -4,12 +4,20 @@
 from netCDF4 import Dataset
 
 with Dataset(sys.argv[1]) as nc1, Dataset(sys.argv[2]) as nc2:
+  # Check if the list of variables are the same
   if nc1.variables.keys()!=nc2.variables.keys():
     print("Variables are different")
-    sys.exit(1)
+    sys.exit(2)
 
   for varname in nc1.variables.keys():
-    diff = nc2[varname][:]-nc1[varname][:]
-    if (np.abs(diff)).max() != 0:
-      print(varname,"is different")
-      sys.exit(1)
+    # First check if each variable has the same dimension
+    if np.shape(nc1[varname][:])!=np.shape(nc2[varname][:]):
+      print(varname,"dimension is different")
+      sys.exit(2)
+    # If dimension is the same, compare data
+    else:
+      diff = nc2[varname][:]-nc1[varname][:]
+
+      if (np.abs(diff)).max() != 0:
+        print(varname,"is different")
+        sys.exit(2)

tests/fv3_conf/ccpp_gfsv16_ugwpv1_run.IN

@@ -0,0 +1,22 @@
+rm -rf INPUT RESTART
+mkdir INPUT RESTART
+if [ $WARM_START = .F. ]; then
+  cp  @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/INPUT/*   ./INPUT
+else
+  cp  @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/INPUT/*   ./INPUT
+  cp  @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/RESTART/* ./INPUT
+fi
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/aerosol.dat .
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/co2historicaldata_201*.txt .
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/sfc_emissivity_idx.txt .
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/solarconstant_noaa_an.txt .
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/global_o3prdlos.f77 ./global_o3prdlos.f77
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/global_h2oprdlos.f77 ./global_h2oprdlos.f77
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/*grb .
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/*_table ./
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/nems.configure ./
+cp    @[INPUTDATA_ROOT]/FV3_input_data_ugwpv1/ugwp_c384_tau.nc ./ugwp_limb_tau.nc
+
+if [ $DO_RRTMGP = .T. ]; then
+  cp  @[INPUTDATA_ROOT]/FV3_input_data_RRTMGP/* .
+fi