Remove Noah-WRFv4, contains "reduce memory required by MERRA2 data" (#410)

.gitmodules

@@ -8,5 +8,7 @@
   branch = main
 [submodule "ccpp/physics"]
   path = ccpp/physics
-  url = https://github.com/NCAR/ccpp-physics
-  branch = main
+  #url = https://github.com/NCAR/ccpp-physics
+  #branch = main
+  url = https://github.com/climbfuji/ccpp-physics
+  branch = remove-noah-wrfv4-bugfix-mp-thompson

ccpp/config/ccpp_prebuild_config.py

@@ -180,8 +180,6 @@
     'physics/physics/sfc_cice.f',
     'physics/physics/sfc_diff.f',
     'physics/physics/sfc_drv.f',
-    'physics/physics/sfc_noah_wrfv4_interstitial.F90',
-    'physics/physics/sfc_noah_wrfv4.F90',
     'physics/physics/sfc_noahmp_drv.F90',
     'physics/physics/flake_driver.F90',
     'physics/physics/sfc_nst.f',

ccpp/data/GFS_typedefs.meta

@@ -1317,14 +1317,6 @@
   type = real
   kind = kind_phys
   active = (control_for_land_surface_scheme == identifier_for_noahmp_land_surface_scheme)
-[snotime]
-  standard_name = time_since_last_snowfall
-  long_name = elapsed time since last snowfall
-  units = s
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [albdirvis_lnd]
   standard_name = surface_albedo_direct_visible_over_land
   long_name = direct surface albedo visible band over land
@@ -3568,12 +3560,6 @@
   units = flag
   dimensions = ()
   type = integer
-[lsm_noah_wrfv4]
-  standard_name = identifier_for_noah_wrfv4_land_surface_scheme
-  long_name = flag for NOAH WRFv4 land surface model
-  units = flag
-  dimensions = ()
-  type = integer
 [kice]
   standard_name = vertical_dimension_of_sea_ice
   long_name = vertical loop extent for ice levels, start at 1
@@ -7577,14 +7563,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[canopy_save]
-  standard_name = canopy_water_amount_save
-  long_name = canopy water amount before entering a physics scheme
-  units = kg m-2
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [cd]
   standard_name = surface_drag_coefficient_for_momentum_in_air
   long_name = surface exchange coeff for momentum
@@ -7662,14 +7640,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[chk_land]
-  standard_name = surface_conductance_for_heat_and_moisture_in_air_over_land
-  long_name = surface conductance for heat & moisture over land
-  units = m s-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [cf_upi]
   standard_name = convective_cloud_fraction_for_microphysics
   long_name = convective cloud fraction for microphysics
@@ -7819,14 +7789,6 @@
   dimensions = (horizontal_loop_extent,4)
   type = real
   kind = kind_phys
-[cmc]
-  standard_name = canopy_water_amount_in_m
-  long_name = canopy water amount in m
-  units = m
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [clxss]
   standard_name = fraction_of_grid_box_with_subgrid_orography_higher_than_critical_height_small_scale
   long_name = frac. of grid box with by subgrid height_above_mean_sea_level higher than critical height small scale
@@ -8067,14 +8029,6 @@
   dimensions = (horizontal_loop_extent,vertical_layer_dimension)
   type = real
   kind = kind_phys
-[dqsdt2]
-  standard_name = saturation_specific_humidity_slope
-  long_name = saturation specific humidity slope at lowest model layer
-  units = K-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [dqsfc1]
   standard_name = instantaneous_surface_upward_latent_heat_flux
   long_name = surface upward latent heat flux
@@ -8089,14 +8043,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[drain_in_m_sm1]
-  standard_name = subsurface_runoff_flux_in_m_sm1
-  long_name = subsurface runoff flux in m s-1
-  units = m s-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [dtdt]
   standard_name = process_split_cumulative_tendency_of_air_temperature
   long_name = air temperature tendency due to model physics
@@ -8381,20 +8327,6 @@
   units = flag
   dimensions = (horizontal_loop_extent)
   type = logical
-[flag_lsm]
-  standard_name = flag_for_calling_land_surface_model
-  long_name = flag for calling land surface model
-  units = flag
-  dimensions = (horizontal_loop_extent)
-  type = logical
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[flag_lsm_glacier]
-  standard_name = flag_for_calling_land_surface_model_glacier
-  long_name = flag for calling land surface model over glacier
-  units = flag
-  dimensions = (horizontal_loop_extent)
-  type = logical
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [ffmm_water]
   standard_name = Monin_Obukhov_similarity_function_for_momentum_over_water
   long_name = Monin-Obukhov similarity function for momentum over water
@@ -9172,22 +9104,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[qs1]
-  standard_name = saturation_specific_humidity_at_lowest_model_layer
-  long_name = saturation specific humidity at lowest model layer
-  units = kg kg-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[qv1]
-  standard_name = bounded_specific_humidity_at_lowest_model_layer_over_land
-  long_name = specific humidity at lowest model layer over land bounded between a nonzero epsilon and saturation
-  units = kg kg-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [radar_reset]
   standard_name = flag_for_resetting_radar_reflectivity_calculation
   long_name = flag for resetting radar reflectivity calculation
@@ -9298,14 +9214,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[runoff_in_m_sm1]
-  standard_name = surface_runoff_flux_in_m_sm1
-  long_name = surface runoff flux in m s-1
-  units = m s-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [save_q(:,:,index_of_ozone_mixing_ratio_in_tracer_concentration_array)]
   standard_name = ozone_mixing_ratio_save
   long_name = ozone mixing ratio before entering a physics scheme
@@ -9472,84 +9380,20 @@
   units = flag
   dimensions = ()
   type = logical
-[slc_save]
-  standard_name = volume_fraction_of_unfrozen_soil_moisture_save
-  long_name = liquid soil moisture before entering a physics scheme
-  units = frac
-  dimensions = (horizontal_loop_extent,vertical_dimension_of_soil)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[smcmax]
-  standard_name = soil_porosity
-  long_name = volumetric soil porosity
-  units = frac
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[smc_save]
-  standard_name = volume_fraction_of_soil_moisture_save
-  long_name = total soil moisture before entering a physics scheme
-  units = frac
-  dimensions = (horizontal_loop_extent,vertical_dimension_of_soil)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [snowc]
   standard_name = surface_snow_area_fraction
   long_name = surface snow area fraction
   units = frac
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[snowd_land_save]
-  standard_name = surface_snow_thickness_water_equivalent_over_land_save
-  long_name = water equivalent snow depth over land before entering a physics scheme
-  units = mm
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[snow_depth]
-  standard_name = actual_snow_depth
-  long_name = actual snow depth
-  units = m
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [snohf]
   standard_name = snow_freezing_rain_upward_latent_heat_flux
   long_name = latent heat flux due to snow and frz rain
   units = W m-2
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[snohf_snow]
-  standard_name = latent_heat_flux_from_precipitating_snow
-  long_name = latent heat flux due to precipitating snow
-  units = W m-2
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[snohf_frzgra]
-  standard_name = latent_heat_flux_from_freezing_rain
-  long_name = latent heat flux due to freezing rain
-  units = W m-2
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[snohf_snowmelt]
-  standard_name = latent_heat_flux_due_to_snowmelt
-  long_name = latent heat flux due to snowmelt phase change
-  units = W m-2
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [snowmp]
   standard_name = lwe_thickness_of_snow_amount
   long_name = explicit snow fall on physics timestep
@@ -9565,22 +9409,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[soilm_in_m]
-  standard_name = soil_moisture_content_in_m
-  long_name = soil moisture in meters
-  units = m
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
-[stc_save]
-  standard_name = soil_temperature_save
-  long_name = soil temperature before entering a physics scheme
-  units = K
-  dimensions = (horizontal_loop_extent,vertical_dimension_of_soil)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [stress]
   standard_name = surface_wind_stress
   long_name = surface wind stress
@@ -9624,14 +9452,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[th1]
-  standard_name = potential_temperature_at_lowest_model_layer
-  long_name = potential_temperature_at_lowest_model_layer
-  units = K
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [tlvl]
   standard_name = air_temperature_at_interface_for_radiation
   long_name = air temperature at vertical interface for radiation calculation
@@ -9667,14 +9487,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[tprcp_rate_land]
-  standard_name = total_precipitation_rate_on_dynamics_timestep_over_land
-  long_name = total precipitation rate in each time step over land
-  units = kg m-2 s-1
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [tracers_start_index]
   standard_name = start_index_of_other_tracers
   long_name = beginning index of the non-water tracer species
@@ -9721,14 +9533,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[tsfc_land_save]
-  standard_name = surface_skin_temperature_over_land_save
-  long_name = surface skin temperature over land before entering a physics scheme
-  units = K
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [tsfg]
   standard_name = surface_ground_temperature_for_radiation
   long_name = surface ground temperature for radiation
@@ -9827,14 +9631,6 @@
   dimensions = (horizontal_loop_extent)
   type = real
   kind = kind_phys
-[weasd_land_save]
-  standard_name = water_equivalent_accumulated_snow_depth_over_land_save
-  long_name = water equiv of acc snow depth over land before entering a physics scheme
-  units = mm
-  dimensions = (horizontal_loop_extent)
-  type = real
-  kind = kind_phys
-  active = (control_for_land_surface_scheme == identifier_for_noah_wrfv4_land_surface_scheme)
 [wind]
   standard_name = wind_speed_at_lowest_model_layer
   long_name = wind speed at lowest model level