Merge pull request NOAA-EMC#106 from climbfuji/update_gsl_develop_fro…

…m_main_20210819 Update gsl develop from develop 2021/08/24
climbfuji · Aug 26, 2021 · b335f3a · b335f3a
2 parents 9beb0f9 + ced5cde
commit b335f3a
Show file tree

Hide file tree

Showing 93 changed files with 3,053 additions and 2,965 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -125,9 +125,7 @@ add_library(fv3atm
   cpl/module_block_data.F90
   cpl/module_cplfields.F90
   cpl/module_cap_cpl.F90
-  io/ffsync.F90
   io/FV3GFS_io.F90
-  io/module_write_nemsio.F90
   io/module_write_netcdf.F90
   io/module_write_netcdf_parallel.F90
   io/module_fv3_io_def.F90
@@ -154,9 +152,7 @@ target_link_libraries(fv3atm PUBLIC fv3dycore
                                     stochastic_physics
                                     fms)
 
-target_link_libraries(fv3atm PUBLIC nemsio::nemsio
-                                    w3emc::w3emc_d
-                                    w3nco::w3nco_d
+target_link_libraries(fv3atm PUBLIC w3nco::w3nco_d
                                     sp::sp_d
                                     bacio::bacio_4
                                     esmf)

diff --git a/atmos_model.F90 b/atmos_model.F90
diff --git a/ccpp/CMakeLists.txt b/ccpp/CMakeLists.txt
@@ -97,7 +97,7 @@ add_subdirectory(framework)
 
 add_subdirectory(physics)
 add_dependencies(ccppphys ccpp)
-target_link_libraries(ccppphys PUBLIC NetCDF::NetCDF_Fortran)
+target_link_libraries(ccppphys PUBLIC w3nco::w3nco_d NetCDF::NetCDF_Fortran)
 # This should not be necessary once framework and physics targets define BUILD_INTERFACE
 target_include_directories(ccppphys PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/framework/src)
 

diff --git a/ccpp/config/ccpp_prebuild_config.py b/ccpp/config/ccpp_prebuild_config.py
@@ -15,26 +15,27 @@
 # dependencies of these files to the list.
 VARIABLE_DEFINITION_FILES = [
     # actual variable definition files
+    'framework/src/ccpp_types.F90',
     'physics/physics/machine.F',
     'physics/physics/radsw_param.f',
+    'physics/physics/radlw_param.f',
     'physics/physics/h2o_def.f',
     'physics/physics/ozne_def.f',
-    'physics/physics/radlw_param.f',
     'physics/physics/radiation_surface.f',
-    'data/CCPP_typedefs.F90',
-    'data/GFS_typedefs.F90',
-    'data/CCPP_data.F90',
     'physics/physics/rte-rrtmgp/rrtmgp/mo_gas_optics_rrtmgp.F90',
     'physics/physics/rte-rrtmgp/rrtmgp/mo_gas_concentrations.F90',
     'physics/physics/rte-rrtmgp/rte/mo_optical_props.F90',
     'physics/physics/rte-rrtmgp/extensions/cloud_optics/mo_cloud_optics.F90',
     'physics/physics/rte-rrtmgp/rte/mo_source_functions.F90',
+    'data/CCPP_typedefs.F90',
+    'data/GFS_typedefs.F90',
+    'data/CCPP_data.F90',
     ]
 
 TYPEDEFS_NEW_METADATA = {
     'ccpp_types' : {
-        'ccpp_types' : '',
         'ccpp_t' : 'cdata',
+        'ccpp_types' : '',
         },
     'machine' : {
         'machine' : '',
@@ -272,27 +273,27 @@
         },
     'mp_thompson' : {
         'mp_thompson_init' : [
-            'cloud_droplet_number_concentration',
-            'water_friendly_aerosol_number_concentration',
-            'ice_friendly_aerosol_number_concentration',
-            'tendency_of_water_friendly_aerosols_at_surface',
-            'tendency_of_ice_friendly_aerosols_at_surface',
+            'mass_number_concentration_of_cloud_liquid_water_particles_in_air',
+            'mass_number_concentration_of_hygroscopic_aerosols',
+            'mass_number_concentration_of_nonhygroscopic_ice_nucleating_aerosols',
+            'tendency_of_hygroscopic_aerosols_at_surface_adjacent_layer',
+            'tendency_of_nonhygroscopic_ice_nucleating_aerosols_at_surface_adjacent_layer',
             # DH* 2020-06-01: turn off calculation of effective radii, now done in GFS_rrtmg_pre
-            #'effective_radius_of_stratiform_cloud_liquid_water_particle_in_um',
-            #'effective_radius_of_stratiform_cloud_ice_particle_in_um',
-            #'effective_radius_of_stratiform_cloud_snow_particle_in_um',
+            #'effective_radius_of_stratiform_cloud_liquid_water_particle',
+            #'effective_radius_of_stratiform_cloud_ice_particle',
+            #'effective_radius_of_stratiform_cloud_snow_particle',
             # *DH 2020-06-01
             ],
         'mp_thompson_run' : [
-            'cloud_droplet_number_concentration_updated_by_physics',
-            'water_friendly_aerosol_number_concentration_updated_by_physics',
-            'ice_friendly_aerosol_number_concentration_updated_by_physics',
-            'tendency_of_water_friendly_aerosols_at_surface',
-            'tendency_of_ice_friendly_aerosols_at_surface',
+            'mass_number_concentration_of_cloud_liquid_water_particles_in_air_of_new_state',
+            'mass_number_concentration_of_hygroscopic_aerosols_of_new_state',
+            'mass_number_concentration_of_nonhygroscopic_ice_nucleating_aerosols_of_new_state',
+            'tendency_of_hygroscopic_aerosols_at_surface_adjacent_layer',
+            'tendency_of_nonhygroscopic_ice_nucleating_aerosols_at_surface_adjacent_layer',
             # DH* 2020-06-01: turn off calculation of effective radii, now done in GFS_rrtmg_pre
-            #'effective_radius_of_stratiform_cloud_liquid_water_particle_in_um',
-            #'effective_radius_of_stratiform_cloud_ice_particle_in_um',
-            #'effective_radius_of_stratiform_cloud_snow_particle_in_um',
+            #'effective_radius_of_stratiform_cloud_liquid_water_particle',
+            #'effective_radius_of_stratiform_cloud_ice_particle',
+            #'effective_radius_of_stratiform_cloud_snow_particle',
             # *DH 2020-06-01
             ],
         },
@@ -303,13 +304,13 @@
          },
     'GFS_rrtmgp_sw_post' : {
          'GFS_rrtmgp_sw_post_run' : [
-             'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_time_step',
+             'tendency_of_air_temperature_due_to_shortwave_heating_assuming_clear_sky_on_radiation_timestep',
              'components_of_surface_downward_shortwave_fluxes',
              ],
          },
     'GFS_rrtmgp_lw_post' : {
          'GFS_rrtmgp_lw_post_run' : [
-             'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_time_step',
+             'tendency_of_air_temperature_due_to_longwave_heating_assuming_clear_sky_on_radiation_timestep',
              ],
          },
     #'subroutine_name_1' : 'all',

diff --git a/ccpp/data/CCPP_data.meta b/ccpp/data/CCPP_data.meta
@@ -46,5 +46,5 @@
   standard_name = GFS_interstitial_type_instance_all_threads
   long_name = instance of derived type GFS_interstitial_type
   units = DDT
-  dimensions = (omp_threads)
+  dimensions = (number_of_openmp_threads)
   type = GFS_interstitial_type