From 3d60bb18c2240a3baa37b777e6e61639049a9f30 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 24 May 2024 13:28:59 -0700 Subject: [PATCH 01/11] updates for perlmutter --- machines/perlmutter/config_machines.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/machines/perlmutter/config_machines.xml b/machines/perlmutter/config_machines.xml index a89159b8..e233764e 100644 --- a/machines/perlmutter/config_machines.xml +++ b/machines/perlmutter/config_machines.xml @@ -59,31 +59,31 @@ PrgEnv-gnu - gcc gcc/11.2.0 + - craype craype/2.7.10 + craype craype/2.7.30 - cray-libsci/21.08.1.2 + cray-libsci/23.12.5 - cray-mpich/8.1.9 + cray-mpich/8.1.28 cray-netcdf-hdf5parallel cray-hdf5-parallel cray-parallel-netcdf - cray-hdf5/1.12.0.7 - cray-netcdf/4.7.4.7 + cray-hdf5 + cray-netcdf - cray-hdf5-parallel/1.12.0.7 - cray-netcdf-hdf5parallel/4.7.4.7 - cray-parallel-netcdf/1.12.1.7 + cray-hdf5-parallel + cray-netcdf-hdf5parallel + cray-parallel-netcdf - cmake/3.20.5 + cmake/3.22.0 From 180ce9e59289fd7bd4bfe4a841df545199bef02a Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Fri, 24 May 2024 14:53:00 -0700 Subject: [PATCH 02/11] remove commented code --- machines/perlmutter/config_machines.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/machines/perlmutter/config_machines.xml b/machines/perlmutter/config_machines.xml index e233764e..fac14222 100644 --- a/machines/perlmutter/config_machines.xml +++ b/machines/perlmutter/config_machines.xml @@ -59,7 +59,7 @@ PrgEnv-gnu - + craype craype/2.7.30 From 057bddd4c3cfd3ee31c49d70509855ca50a6fa2b Mon Sep 17 00:00:00 2001 From: David Bailey Date: Fri, 31 May 2024 16:14:57 -0600 Subject: [PATCH 03/11] Add gx3v7 grid for WW3 --- component_grids_nuopc.xml | 6 ++++++ modelgrid_aliases_nuopc.xml | 16 ++++++++++++++++ 2 files changed, 22 insertions(+) diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index 97b3fc9e..fd7b786f 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -532,6 +532,12 @@ WW3 90 x 50 global grid For testing of the WAV model + + 100 116 + $DIN_LOC_ROOT/share/meshes/wgx3v7_2301208_ESMFmesh.nc + gx3v7 global grid + For testing of the WAV model + 540 458 $DIN_LOC_ROOT/share/meshes/wtx0.66v1_210917_ESMFmesh.nc diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml index 0d53481b..3e6ee1e1 100644 --- a/modelgrid_aliases_nuopc.xml +++ b/modelgrid_aliases_nuopc.xml @@ -357,6 +357,14 @@ JRA025 + + TL319 + TL319 + tx2_3v2 + JRA025 + wgx3v7 + + TL319 TL319 @@ -940,6 +948,14 @@ tx2_3v2 + + ne30np4.pg3 + ne30np4.pg3 + tx2_3v2 + wgx3v7 + tx2_3v2 + + ne30np4.pg3 ne30np4.pg3 From 6cadb494b764d72957f1207ef40646654b3f1972 Mon Sep 17 00:00:00 2001 From: huebleruwm Date: Thu, 6 Jun 2024 15:17:35 -0600 Subject: [PATCH 04/11] Making additions to Depends.nvhpc to enable GPU compilation of clubb code. --- machines/Depends.nvhpc | 84 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 84 insertions(+) diff --git a/machines/Depends.nvhpc b/machines/Depends.nvhpc index e1c9b4e7..84b6596f 100644 --- a/machines/Depends.nvhpc +++ b/machines/Depends.nvhpc @@ -60,6 +60,88 @@ mo_fluxes_broadband_kernels.o \ mo_rte_solver_kernels.o \ mo_optical_props_kernels.o +CLUBB_OBJS=\ +adg1_adg2_3d_luhar_pdf.o\ +advance_clubb_core_module.o\ +advance_helper_module.o\ +advance_windm_edsclrm_module.o\ +advance_wp2_wp3_module.o\ +advance_xm_wpxp_module.o\ +advance_xp2_xpyp_module.o\ +advance_xp3_module.o\ +array_index.o\ +calc_pressure.o\ +calc_roots.o\ +calendar.o\ +clip_explicit.o\ +clip_semi_implicit.o\ +clubb_api_module.o\ +clubb_precision.o\ +code_timer_module.o\ +constants_clubb.o\ +corr_varnce_module.o\ +diagnose_correlations_module.o\ +diffusion.o\ +endian.o\ +error_code.o\ +file_functions.o\ +fill_holes.o\ +grid_class.o\ +hydromet_pdf_parameter_module.o\ +index_mapping.o\ +input_names.o\ +input_reader.o\ +interpolation.o\ +lapack_interfaces.o\ +lapack_wrap.o\ +LY93_pdf.o\ +matrix_operations.o\ +matrix_solver_wrapper.o\ +mean_adv.o\ +mixing_length.o\ +model_flags.o\ +mono_flux_limiter.o\ +mt95.o\ +Nc_Ncn_eqns.o\ +new_hybrid_pdf.o\ +new_hybrid_pdf_main.o\ +new_pdf.o\ +new_pdf_main.o\ +new_tsdadg_pdf.o\ +numerical_check.o\ +output_grads.o\ +output_netcdf.o\ +parameter_indices.o\ +parameters_model.o\ +parameters_tunable.o\ +pdf_closure_module.o\ +pdf_parameter_module.o\ +pdf_utilities.o\ +penta_lu_solver.o\ +pos_definite_module.o\ +precipitation_fraction.o\ +saturation.o\ +setup_clubb_pdf_params.o\ +sfc_varnce_module.o\ +sigma_sqd_w_module.o\ +Skx_module.o\ +sponge_layer_damping.o\ +stat_file_module.o\ +stats_clubb_utilities.o\ +stats_lh_sfc_module.o\ +stats_lh_zt_module.o\ +stats_rad_zm_module.o\ +stats_rad_zt_module.o\ +stats_sfc_module.o\ +stats_type.o\ +stats_type_utilities.o\ +stats_variables.o\ +stats_zm_module.o\ +stats_zt_module.o\ +T_in_K_module.o\ +tridiag_lu_solver.o\ +turbulent_adv_pdf.o + ifeq ($(DEBUG),FALSE) $(PERFOBJS): %.o: %.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -Mfprelaxed=div $< @@ -75,4 +157,6 @@ ifeq ($(DEBUG),FALSE) $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -fastsse -Mnofma -Mflushz -Mfprelaxed=sqrt $(GPUFLAGS) $< $(RRTMGP_OBJS): %.o: %.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $< + $(CLUBB_OBJS): %.o: %.F90 + $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) $(GPUFLAGS) $< endif From f73680d1dc74e9e9fb98cb1285ff89da00073d7f Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 13 Jun 2024 14:11:54 -0600 Subject: [PATCH 05/11] Add Cidadinho test site. --- component_grids_mct.xml | 5 +++++ component_grids_nuopc.xml | 5 +++++ modelgrid_aliases_mct.xml | 6 ++++++ modelgrid_aliases_nuopc.xml | 6 ++++++ 4 files changed, 22 insertions(+) diff --git a/component_grids_mct.xml b/component_grids_mct.xml index 613c9acf..d93cfadd 100644 --- a/component_grids_mct.xml +++ b/component_grids_mct.xml @@ -640,6 +640,11 @@ $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-smallvilleIA_test.110106.nc 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset + + 1 1 + $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-cidadinhoBR_test.240613.nc + 1x1 Cidadinho ("Smallville") Brazil Crop Test Case -- only valid for DATM/CLM compset + 1 1 $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-camdenNJ_navy.111004.nc diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index cc0bb19d..1bb0d634 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -553,6 +553,11 @@ 267.0228 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset + + -12.9952 + 305.3233 + 1x1 Cidadinho ("Smallville") Brazil Crop Test Case -- only valid for DATM/CLM compset + 40.0 285.0 diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml index 74ea6c06..84741694 100644 --- a/modelgrid_aliases_mct.xml +++ b/modelgrid_aliases_mct.xml @@ -67,6 +67,12 @@ null + + 1x1_cidadinhoBR + 1x1_cidadinhoBR + null + + 1x1_camdenNJ 1x1_camdenNJ diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml index f84d8706..a08928d7 100644 --- a/modelgrid_aliases_nuopc.xml +++ b/modelgrid_aliases_nuopc.xml @@ -68,6 +68,12 @@ null + + 1x1_cidadinhoBR + 1x1_cidadinhoBR + null + + 1x1_camdenNJ 1x1_camdenNJ From b9cf077fa7dd322315e248d7ab3c94715f907cf5 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 13 Jun 2024 15:31:30 -0600 Subject: [PATCH 06/11] Remove MCT changes for Cidadinho. --- component_grids_mct.xml | 5 ----- modelgrid_aliases_mct.xml | 6 ------ 2 files changed, 11 deletions(-) diff --git a/component_grids_mct.xml b/component_grids_mct.xml index d93cfadd..613c9acf 100644 --- a/component_grids_mct.xml +++ b/component_grids_mct.xml @@ -640,11 +640,6 @@ $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-smallvilleIA_test.110106.nc 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset - - 1 1 - $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-cidadinhoBR_test.240613.nc - 1x1 Cidadinho ("Smallville") Brazil Crop Test Case -- only valid for DATM/CLM compset - 1 1 $DIN_LOC_ROOT/share/domains/domain.clm/domain.lnd.1x1pt-camdenNJ_navy.111004.nc diff --git a/modelgrid_aliases_mct.xml b/modelgrid_aliases_mct.xml index 84741694..74ea6c06 100644 --- a/modelgrid_aliases_mct.xml +++ b/modelgrid_aliases_mct.xml @@ -67,12 +67,6 @@ null - - 1x1_cidadinhoBR - 1x1_cidadinhoBR - null - - 1x1_camdenNJ 1x1_camdenNJ From 75847d58bac1149adcb8d9b40181df631c273e19 Mon Sep 17 00:00:00 2001 From: Sam Rabin Date: Thu, 13 Jun 2024 15:34:49 -0600 Subject: [PATCH 07/11] Note that Smallville and Cidadinho use synthetic land data, --- component_grids_nuopc.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/component_grids_nuopc.xml b/component_grids_nuopc.xml index 1bb0d634..3276af3d 100644 --- a/component_grids_nuopc.xml +++ b/component_grids_nuopc.xml @@ -551,12 +551,12 @@ 40.6878 267.0228 - 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset + 1x1 Smallville Iowa Crop Test Case w/ synthetic land data -- only valid for DATM/CLM compset -12.9952 305.3233 - 1x1 Cidadinho ("Smallville") Brazil Crop Test Case -- only valid for DATM/CLM compset + 1x1 Cidadinho ("Smallville") Brazil Crop Test Case w/ synthetic land data -- only valid for DATM/CLM compset 40.0 From e044a84f8afe7a638bf556646a1f723d476fe903 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Fri, 14 Jun 2024 06:43:09 -0600 Subject: [PATCH 08/11] removed mapping files that are no longer needed when cism now sends rof to mosart rather than ocean --- maps_nuopc.xml | 71 -------------------------------------------------- 1 file changed, 71 deletions(-) diff --git a/maps_nuopc.xml b/maps_nuopc.xml index c9e6b607..f5d3d56a 100644 --- a/maps_nuopc.xml +++ b/maps_nuopc.xml @@ -95,77 +95,6 @@ cpl/gridmaps/rJRA025/map_jra_to_tx2_3_nnsm_e333r100_230415.nc - - - - - - - - - - - - - cpl/gridmaps/gland4km/map_gland4km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc - cpl/gridmaps/gland4km/map_gland4km_to_gx1v6_nnsm_e1000r300_171105.nc - - - cpl/gridmaps/gland4km/map_gland4km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc - cpl/gridmaps/gland4km/map_gland4km_to_gx1v7_nnsm_e1000r300_171105.nc - - - - cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc - cpl/gridmaps/gland4km/map_gland4km_to_gx3v7_nnsm_e1000r500_180502.nc - - - cpl/gridmaps/gland20km/map_gland20km_to_gx1v6_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc - cpl/gridmaps/gland20km/map_gland20km_to_gx1v6_nnsm_e1000r300_171105.nc - - - cpl/gridmaps/gland20km/map_gland20km_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_171105.nc - cpl/gridmaps/gland20km/map_gland20km_to_gx1v7_nnsm_e1000r300_171105.nc - - - - cpl/gridmaps/gland20km/map_gland20km_to_gx3v7_nnsm_e1000r500_180502.nc - cpl/gridmaps/gland20km/map_gland20km_to_gx3v7_nnsm_e1000r500_180502.nc - - - cpl/gridmaps/ais8/map_ais8_to_gx1v7_nn_open_ocean_nnsm_e1000r300_marginal_sea_TOBECREATED.nc - cpl/gridmaps/ais8/map_ais8_to_gx1v7_nnsm_e1000r300_TOBECREATED.nc - - - cpl/gridmaps/gland4km/map_gland4km_to_tx0.66v1_nnsm_e1000r300_190314.nc - cpl/gridmaps/gland4km/map_gland4km_to_tx0.66v1_nnsm_e1000r300_190314.nc - - - cpl/gridmaps/gland4km/map_gland4km_to_tx2_3_nnsm_e250r250_230914.nc - cpl/gridmaps/gland4km/map_gland4km_to_tx2_3_nnsm_e1000r300_230415.nc - - - - - - - - - cpl/gridmaps/ww3a/map_ww3a_TO_gx3v7_splice_150428.nc - cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc - cpl/gridmaps/gx3v7/map_gx3v7_TO_ww3a_splice_150428.nc - - - cpl/gridmaps/ww3a/map_ww3a_TO_gx1v6_splice_150428.nc - cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc - cpl/gridmaps/gx1v6/map_gx1v6_TO_ww3a_splice_150428.nc - - - cpl/gridmaps/ww3a/map_ww3a_TO_gx1v7_splice_170214.nc - cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc - cpl/gridmaps/gx1v7/map_gx1v7_TO_ww3a_splice_170214.nc - - From c30a2831556f269675971b11c5c156ea92599878 Mon Sep 17 00:00:00 2001 From: Jim Edwards Date: Thu, 20 Jun 2024 13:59:57 -0600 Subject: [PATCH 09/11] add a PFUNIT for github workflow of cesm_share --- machines/cmake_macros/ubuntu-latest.cmake | 1 + 1 file changed, 1 insertion(+) create mode 100644 machines/cmake_macros/ubuntu-latest.cmake diff --git a/machines/cmake_macros/ubuntu-latest.cmake b/machines/cmake_macros/ubuntu-latest.cmake new file mode 100644 index 00000000..2a5718bb --- /dev/null +++ b/machines/cmake_macros/ubuntu-latest.cmake @@ -0,0 +1 @@ +set(PFUNIT_PATH "$GITHUB_WORKSPACE/pfunit/build") \ No newline at end of file From 7adbb950baf4af6481adb62a127b6d0e3a92cc84 Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Thu, 27 Jun 2024 05:51:52 -0600 Subject: [PATCH 10/11] new trigrid alias --- modelgrid_aliases_nuopc.xml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/modelgrid_aliases_nuopc.xml b/modelgrid_aliases_nuopc.xml index a2fc0823..b212e34e 100644 --- a/modelgrid_aliases_nuopc.xml +++ b/modelgrid_aliases_nuopc.xml @@ -376,6 +376,14 @@ gx1v7 + + + ne30np4.pg3 + 0.9x1.25 + tnx1v4 + tnx1v4 + + From 44838ead11a4533bd58e84884242528a0c8697ff Mon Sep 17 00:00:00 2001 From: Mariana Vertenstein Date: Wed, 10 Jul 2024 15:47:27 +0200 Subject: [PATCH 11/11] removed nodes at least one of which is problematic - but could be more than one --- machines/config_batch.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/machines/config_batch.xml b/machines/config_batch.xml index 414e196e..ab1bffc0 100644 --- a/machines/config_batch.xml +++ b/machines/config_batch.xml @@ -183,7 +183,7 @@ -l nodes={{ num_nodes }} -q iccp - -V + -V @@ -677,6 +677,7 @@ --ntasks={{ total_tasks }} --export=ALL --switches=1 + --exclude=b3355,b3356,b3357,b3359,b3379,b3382,b3383 --partition=normal