Merge pull request #300 from NickSzapiro-NOAA/escomp_simplify_datm

Unify cfsr and gefs datm datamodes

Author: jedwards4b

datm/CMakeLists.txt

@@ -5,7 +5,6 @@ set(SRCFILES atm_comp_nuopc.F90
              datm_datamode_core2_mod.F90
              datm_datamode_jra_mod.F90
              datm_datamode_gefs_mod.F90
-             datm_datamode_cfsr_mod.F90
              datm_datamode_era5_mod.F90
              datm_datamode_simple_mod.F90)
 

datm/atm_comp_nuopc.F90

@@ -63,10 +63,6 @@ module cdeps_datm_comp
   use datm_datamode_gefs_mod    , only : datm_datamode_gefs_init_pointers
   use datm_datamode_gefs_mod    , only : datm_datamode_gefs_advance
 
-  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_advertise
-  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_init_pointers
-  use datm_datamode_cfsr_mod    , only : datm_datamode_cfsr_advance
-
   use datm_datamode_simple_mod  , only : datm_datamode_simple_advertise
   use datm_datamode_simple_mod  , only : datm_datamode_simple_init_pointers
   use datm_datamode_simple_mod  , only : datm_datamode_simple_advance
@@ -362,7 +358,6 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
          trim(datamode) == 'CLMNCEP'      .or. &
          trim(datamode) == 'CPLHIST'      .or. &
          trim(datamode) == 'GEFS'         .or. &
-         trim(datamode) == 'CFSR'         .or. &
          trim(datamode) == 'ERA5'         .or. &
          trim(datamode) == 'SIMPLE') then
     else
@@ -394,9 +389,6 @@ subroutine InitializeAdvertise(gcomp, importState, exportState, clock, rc)
     case ('GEFS')
        call datm_datamode_gefs_advertise(exportState, fldsExport, flds_scalar_name, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
-    case ('CFSR')
-       call datm_datamode_cfsr_advertise(exportState, fldsExport, flds_scalar_name, rc)
-       if (ChkErr(rc,__LINE__,u_FILE_u)) return
     case ('SIMPLE')
        call datm_datamode_simple_advertise(exportState, fldsExport, flds_scalar_name, &
             nlfilename, my_task, vm, rc)
@@ -643,9 +635,6 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
        case('GEFS')
           call datm_datamode_gefs_init_pointers(exportState, sdat, rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
-       case('CFSR')
-          call datm_datamode_cfsr_init_pointers(exportState, sdat, rc)
-          if (ChkErr(rc,__LINE__,u_FILE_u)) return
        case('SIMPLE')
           call datm_datamode_simple_init_pointers(exportState, sdat, rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
@@ -656,7 +645,7 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
           call shr_get_rpointer_name(gcomp, 'atm', target_ymd, target_tod, rpfile, 'read', rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return
           select case (trim(datamode))
-          case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','CFSR','SIMPLE')
+          case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
              call dshr_restart_read(restfilm, rpfile, logunit, my_task, mpicom, sdat, rc)
              if (ChkErr(rc,__LINE__,u_FILE_u)) return
           case default
@@ -712,9 +701,6 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
     case('GEFS')
        call datm_datamode_gefs_advance(exportstate, mainproc, logunit, mpicom, target_ymd, &
             target_tod, sdat%model_calendar, rc)
-    case('CFSR')
-       call datm_datamode_cfsr_advance(exportstate, mainproc, logunit, mpicom, target_ymd, &
-            target_tod, sdat%model_calendar, rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
     case('SIMPLE')
        call datm_datamode_simple_advance(target_ymd, target_tod, target_mon, &
@@ -727,7 +713,7 @@ subroutine datm_comp_run(gcomp, importState, exportState, target_ymd, target_tod
        call shr_get_rpointer_name(gcomp, 'atm', target_ymd, target_tod, rpfile, 'write', rc)
        if (ChkErr(rc,__LINE__,u_FILE_u)) return
        select case (trim(datamode))
-       case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','CFSR','SIMPLE')
+       case('CORE2_NYF','CORE2_IAF','CORE_IAF_JRA','CLMNCEP','CPLHIST','ERA5','GEFS','SIMPLE')
           call dshr_restart_write(rpfile, case_name, 'datm', inst_suffix, target_ymd, target_tod, logunit, &
                my_task, sdat, rc)
           if (ChkErr(rc,__LINE__,u_FILE_u)) return

datm/datm_datamode_cfsr_mod.F90

@@ -64,11 +64,9 @@ ERA5 (``datm_datamode_era5_mod.F90``)
   `$CESMDATAROOT/inputdata/atm/datm7/ERA5`
 
 .. note::
-  In addition to the exiting DATM data modes, the `CDEPS fork <https://github.com/NOAA-EMC/CDEPS>`_
+  Using the GEFS data mode, the `CDEPS fork <https://github.com/NOAA-EMC/CDEPS>`_
   used by `NOAA's UFS Weather Model <https://github.com/ufs-community/ufs-weather-model>`_
-  also includes additional data modes such as CFSR, GEFS and GFS. These data modes are not
-  merged with the NCAR's authoritative repository yet but it is tested under UFS Weather
-  model.
+  supports CFSR, GEFS and GFS data inputs.
 
 .. _datm-cime-vars: