merge noresm WW3_Interface into main

.gitmodules

@@ -1,7 +1,6 @@
 [submodule "WW3"]
 path = WW3
-url = https://github.com/ESCOMP/WW3.git
-fxtag = dev/unified_0.1.0
+url = https://github.com/NorESMhub/WW3.git
+fxtag = dev/unified_0.1.0_noresm_v0
 fxrequired = AlwaysRequired
-fxDONOTUSEurl = https://github.com/ESCOMP/WW3.git
-
+fxDONOTUSEurl = https://github.com/NorESMhub/WW3.git

README.md

@@ -1,3 +1,3 @@
 # WW3_interface
 
-This repository encapsulates the newest CESM WaveWatch III repository (forked from NOAA-EMC) and acts as an interface between WW3 and CESM.
+This repository encapsulates the newest NorESM WaveWatch III repository (forked from NOAA-EMC) and acts as an interface between WW3 and NorESM.

cime_config/buildnml

@@ -81,27 +81,19 @@ def _create_namelists(case, confdir, namelist_infile, nmlgen, data_list_path):
         else:
             nmlgen.set_value("initfile", "")
 
-    # error check 
+    # error check
     dtcpl = basedt / int(ncpl)
     dtmax = int(float(nmlgen.get_value('dtmax')))
     if dtcpl%dtmax != 0:
         expect(False,
                'dtcpl {} is not a multiple of dtmax {}'.format(dtcpl,dtmax))
 
-    nmlgen.set_value("domain_percent_start", f"{start_date} {start_tod}")
-
-    nmlgen.set_value("date_percent_field_percent_start"  , f"{start_date} {start_tod}")
-    nmlgen.set_value("date_percent_restart_percent_start", f"{start_date} {start_tod}")
-
-    nmlgen.set_value("date_percent_field_percent_stride"  , f"{dtime_sync}")
-    nmlgen.set_value("date_percent_restart_percent_stride", f"{dtime_sync}")
-
     # write diagnostic info
     logger.debug("ww3 initial conditions file is %s", nmlgen.get_value("initfile"))
 
     namelist_file = os.path.join(confdir, "wav_in")
-    nmlgen.write_output_file(namelist_file, data_list_path, 
-                             groups=["domain_nml","input_nml","output_type_nml","output_date_nml","ww3_inparm"], 
+    nmlgen.write_output_file(namelist_file, data_list_path,
+                             groups=["input_nml","output_type_nml","ww3_inparm"],
                              sorted_groups=False)
 
     from pathlib import Path
@@ -196,7 +188,7 @@ def buildnml(case, caseroot, compname):
             shutil.copy2(file1, file2)
 
     _prestage_inputs(case)
-            
+
 ###############################################################################
 def _prestage_inputs(case):
 ###############################################################################
@@ -228,7 +220,7 @@ def _prestage_inputs(case):
             for filename in files:
                 if not os.path.isfile(os.path.join(output_dir, filename)):
                     safe_copy(os.path.join(input_dir, filename), os.path.join(output_dir, filename))
-                
+
         # Create mod_def file using ww3_grid and the grid_input files
         if not os.path.isfile(os.path.join(output_dir,"ww3_grid")):
             logger.warning("ww3_grid file not found. The mod_def.ww3 file will be created after the build phase.")
@@ -245,20 +237,20 @@ def _prestage_inputs(case):
             shutil.move(os.path.join(output_dir,"mod_def.ww3"), os.path.join(rundir, "mod_def.ww3"))
 
     else:
-        # Use mod_def already created 
+        # Use mod_def already created
         mod_def_in = case.get_value("WW3_MODDEF")
         if os.path.isfile(mod_def_in):
             import filecmp
             copy_file = False
-            if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")): 
+            if not os.path.isfile(os.path.join(rundir, "mod_def.ww3")):
                 copy_file = True
             elif not filecmp.cmp(mod_def_in, os.path.join(rundir, "mod_def.ww3")):
                 copy_file = True
             if copy_file:
                 shutil.copy(mod_def_in, os.path.join(rundir, "mod_def.ww3"))
         else:
             raise RuntimeError("mod_def_in {} does not exist on disk".format(mod_def_in))
-            
+
 ###############################################################################
 def _main_func():
 ###############################################################################

cime_config/config_component.xml

@@ -46,7 +46,7 @@
     <group>case_comp</group>
     <file>env_build.xml</file>
     <desc>mod_def file to use. The value depends on the switches, if you have an unstructured mesh and the
-    wave propoagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory.
+    wave propagation scheme. Note that this file is renamed to mod_def.ww3 in the run directory.
     </desc>
   </entry>
 

cime_config/config_compsets.xml

@@ -4,15 +4,15 @@
 
   <help>
     Each compset node is associated with the following elements
-    - lname      
-    - alias        
+    - lname
+    - alias
     - support  (optional description of the support level for this compset)
     Each compset node can also have the following attributes
     - grid  (optional regular expression match for grid to work with the compset)
   </help>
 
   <compset>
-    <alias>WW3test</alias>   
+    <alias>WW3test</alias>
     <lname>2000_DATM%NYF_SLND_SICE_SOCN_SROF_SGLC_WW3</lname>
   </compset>
 

cime_config/config_pes.xml

@@ -1,43 +1,118 @@
 <?xml version="1.0"?>
 
-<config_pes>
+<config_pes  version="2.0">
 
   <grid name="any">
     <mach name="betzy">
       <pes pesize="any" compset="DATM.*WW3">
 	<comment>none</comment>
 	<ntasks>
-	  <ntasks_atm>256</ntasks_atm> 
-	  <ntasks_rof>256</ntasks_rof> 
-	  <ntasks_ice>256</ntasks_ice> 
-	  <ntasks_ocn>256</ntasks_ocn> 
-	  <ntasks_cpl>256</ntasks_cpl> 
+	  <ntasks_atm>256</ntasks_atm>
+	  <ntasks_rof>256</ntasks_rof>
+	  <ntasks_ice>256</ntasks_ice>
+	  <ntasks_ocn>256</ntasks_ocn>
+	  <ntasks_cpl>256</ntasks_cpl>
 	  <ntasks_lnd>256</ntasks_lnd>
-	  <ntasks_glc>256</ntasks_glc> 
-	  <ntasks_wav>256</ntasks_wav> 
+	  <ntasks_glc>256</ntasks_glc>
+	  <ntasks_wav>256</ntasks_wav>
 	</ntasks>
 	<nthrds>
-	  <nthrds_atm>1</nthrds_atm>                   
-	  <nthrds_lnd>1</nthrds_lnd> 
-	  <nthrds_rof>1</nthrds_rof> 
-	  <nthrds_ice>1</nthrds_ice> 
-	  <nthrds_ocn>1</nthrds_ocn> 
-	  <nthrds_glc>1</nthrds_glc> 
-	  <nthrds_wav>1</nthrds_wav> 
-	  <nthrds_cpl>1</nthrds_cpl> 
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
 	</nthrds>
 	<rootpe>
-	  <rootpe_atm>0</rootpe_atm> 
-	  <rootpe_lnd>0</rootpe_lnd> 
-	  <rootpe_rof>0</rootpe_rof> 
-	  <rootpe_ice>0</rootpe_ice>    
-	  <rootpe_ocn>0</rootpe_ocn>   
-	  <rootpe_glc>0</rootpe_glc> 
-	  <rootpe_wav>0</rootpe_wav> 
-	  <rootpe_cpl>0</rootpe_cpl>                         
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
 	</rootpe>
       </pes>
     </mach>
   </grid>
 
+  <grid name="m%w025">
+    <mach name="betzy">
+      <pes pesize="any" compset="DATM.*WW3">
+	<comment>none</comment>
+	<ntasks>
+	  <ntasks_atm>-8</ntasks_atm>
+	  <ntasks_rof>-8</ntasks_rof>
+	  <ntasks_ice>-8</ntasks_ice>
+	  <ntasks_ocn>-8</ntasks_ocn>
+	  <ntasks_cpl>-8</ntasks_cpl>
+	  <ntasks_lnd>-8</ntasks_lnd>
+	  <ntasks_glc>-8</ntasks_glc>
+	  <ntasks_wav>-8</ntasks_wav>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
+  </grid>
+
+  <grid name="m%w025">
+    <mach name="olivia">
+      <pes pesize="any" compset="DATM.*WW3">
+	<comment>none</comment>
+	<ntasks>
+	  <ntasks_atm>-4</ntasks_atm>
+	  <ntasks_rof>-4</ntasks_rof>
+	  <ntasks_ice>-4</ntasks_ice>
+	  <ntasks_ocn>-4</ntasks_ocn>
+	  <ntasks_cpl>-4</ntasks_cpl>
+	  <ntasks_lnd>-4</ntasks_lnd>
+	  <ntasks_glc>-4</ntasks_glc>
+	  <ntasks_wav>-4</ntasks_wav>
+	</ntasks>
+	<nthrds>
+	  <nthrds_atm>1</nthrds_atm>
+	  <nthrds_lnd>1</nthrds_lnd>
+	  <nthrds_rof>1</nthrds_rof>
+	  <nthrds_ice>1</nthrds_ice>
+	  <nthrds_ocn>1</nthrds_ocn>
+	  <nthrds_glc>1</nthrds_glc>
+	  <nthrds_wav>1</nthrds_wav>
+	  <nthrds_cpl>1</nthrds_cpl>
+	</nthrds>
+	<rootpe>
+	  <rootpe_atm>0</rootpe_atm>
+	  <rootpe_lnd>0</rootpe_lnd>
+	  <rootpe_rof>0</rootpe_rof>
+	  <rootpe_ice>0</rootpe_ice>
+	  <rootpe_ocn>0</rootpe_ocn>
+	  <rootpe_glc>0</rootpe_glc>
+	  <rootpe_wav>0</rootpe_wav>
+	  <rootpe_cpl>0</rootpe_cpl>
+	</rootpe>
+      </pes>
+    </mach>
+  </grid>
 </config_pes>