add landice gridcomp

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+- Added landice grid comp
+
 ### Changed
 
 - More optimal distribution of tiles on processors for cubed-sphere tile space.

CMakeLists.txt

@@ -11,7 +11,7 @@ esma_add_library(${this}
   SRCS GEOS_LdasGridComp.F90
   SUBCOMPONENTS ${alldirs}
   SUBDIRS LDAS_Shared
-  DEPENDENCIES GEOSland_GridComp makebcs MAPL
+  DEPENDENCIES GEOSland_GridComp GEOSlandice_GridComp makebcs MAPL
   INCLUDES ${INC_ESMF})
 
 esma_add_subdirectory(GEOSldas_App)

GEOSldas_App/lenkf_j_template.py

@@ -102,7 +102,7 @@
 
 setenv    HOMDIR         $EXPDIR/run/
 setenv    SCRDIR         $EXPDIR/scratch
-setenv    MODEL          {MY_MODEL}
+setenv    LANDMODEL      {MY_LANDMODEL}
 setenv    MYNAME         `finger $USER | cut -d: -f3 | head -1`
 setenv    POSTPROC_HIST  {MY_POSTPROC_HIST}
 
@@ -716,14 +716,24 @@
        set THISDIR = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/
        if (! -e $THISDIR            ) mkdir -p $THISDIR
 
-       set rstf = ${{MODEL}} 
-       if (-f ${{rstf}}${{ENSID}}_internal_checkpoint ) then
-          set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/${{EXPID}}.${{rstf}}_internal_rst.${{eYEAR}}${{eMON}}${{eDAY}}_${{eHour}}${{eMin}}
-          /bin/mv ${{rstf}}${{ENSID}}_internal_checkpoint $tmp_file
-          /bin/rm -f $EXPDIR/input/restart/${{rstf}}${{ENSID}}_internal_rst
-          /bin/ln -rs  $tmp_file $EXPDIR/input/restart/${{rstf}}${{ENSID}}_internal_rst
+       set rstfs = (${{LANDMODEL}} 'landice')
+       foreach rstf ( $rstfs )
+          if (-f ${{rstf}}${{ENSID}}_internal_checkpoint ) then
+             set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/${{EXPID}}.${{rstf}}_internal_rst.${{eYEAR}}${{eMON}}${{eDAY}}_${{eHour}}${{eMin}}
+             /bin/mv ${{rstf}}${{ENSID}}_internal_checkpoint $tmp_file
+             /bin/rm -f $EXPDIR/input/restart/${{rstf}}${{ENSID}}_internal_rst
+             /bin/ln -rs  $tmp_file $EXPDIR/input/restart/${{rstf}}${{ENSID}}_internal_rst
+          endif
+       end
+
+       set rstf = 'landassim_obspertrseed'
+       if (-f ${{rstf}}${{ENSID}}_checkpoint ) then
+         set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/${{EXPID}}.${{rstf}}_rst.${{eYEAR}}${{eMON}}${{eDAY}}_${{eHour}}${{eMin}}
+         /bin/mv ${{rstf}}${{ENSID}}_checkpoint $tmp_file
+         /bin/rm -f $EXPDIR/input/restart/${{rstf}}${{ENSID}}_rst
+         /bin/ln -rs  $tmp_file $EXPDIR/input/restart/${{rstf}}${{ENSID}}_rst
        endif
-   
+
        set rstf = 'landpert'
        if (-f ${{rstf}}${{ENSID}}_internal_checkpoint ) then
           set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/${{EXPID}}.${{rstf}}_internal_rst.${{eYEAR}}${{eMON}}${{eDAY}}_${{eHour}}${{eMin}}
@@ -737,28 +747,22 @@
           /usr/bin/gzip $old_rst &
        endif
 
-       set rstf = 'landassim_obspertrseed'
-       if (-f ${{rstf}}${{ENSID}}_checkpoint ) then
-          set tmp_file = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{eYEAR}}/M${{eMON}}/${{EXPID}}.${{rstf}}_rst.${{eYEAR}}${{eMON}}${{eDAY}}_${{eHour}}${{eMin}}
-          /bin/mv ${{rstf}}${{ENSID}}_checkpoint $tmp_file
-          /bin/rm -f $EXPDIR/input/restart/${{rstf}}${{ENSID}}_rst
-          /bin/ln -rs $tmp_file $EXPDIR/input/restart/${{rstf}}${{ENSID}}_rst
-       endif
    # move intermediate check point files to  output/$EXPDOMAIN/rs/$ENSDIR/Yyyyy/Mmm/ directories
    # -------------------------------------------------------------------------------------------
 
-       set rstfiles1 = `ls ${{MODEL}}${{ENSID}}_internal_checkpoint.*`
+       set rstfiles1 = `ls ${{LANDMODEL}}${{ENSID}}_internal_checkpoint.*`
        set rstfiles2 = `ls landpert${{ENSID}}_internal_checkpoint.*`
        set rstfiles3 = `ls landassim_obspertrseed${{ENSID}}_checkpoint.*`
+       set rstfiles4 = `ls landice${{ENSID}}_internal_checkpoint.*`
 
-       foreach rfile ( $rstfiles1 ) 
+       foreach rfile ( $rstfiles1 $rstfiles4 ) 
           set ThisTime = `echo $rfile | rev | cut -d'.' -f2 | rev`
           set TY = `echo $ThisTime | cut -c1-4`
           set TM = `echo $ThisTime | cut -c5-6` 
           set THISDIR = $EXPDIR/output/$EXPDOMAIN/rs/$ENSDIR/Y${{TY}}/M${{TM}}/
           if (! -e $THISDIR            ) mkdir -p $THISDIR
-          /bin/mv $rfile ${{THISDIR}}${{EXPID}}.${{MODEL}}_internal_rst.${{ThisTime}}.nc4
-          /usr/bin/gzip ${{THISDIR}}${{EXPID}}.${{MODEL}}_internal_rst.${{ThisTime}}.nc4 &
+          /bin/mv $rfile ${{THISDIR}}${{EXPID}}.${{LANDMODEL}}_internal_rst.${{ThisTime}}.nc4
+          /usr/bin/gzip ${{THISDIR}}${{EXPID}}.${{LANDMODEL}}_internal_rst.${{ThisTime}}.nc4 &
        end
 
        foreach rfile ( $rstfiles2 ) 

GEOSldas_App/preprocess_ldas.F90

@@ -5,12 +5,11 @@
 program main
 
   use preprocess_ldas_routines,     ONLY:    &
-       createf2g,                            &
-       createLocalTilefile,                  &
-       createLocalBC,                        &
-       createLocalVegRestart,                &
-       createLocalmwRTMRestart,              &
-       createLocalCatchRestart,              &
+       create_mapping,                       &
+       createZoominTilefile,                 &
+       createZoominBC,                       &
+       createZoominVegRestart,               &
+       createZoominRestart,                  &
        correctEase,                          &
        convert_pert_rst,                     &
        optimize_latlon
@@ -26,6 +25,7 @@ program main
   character(len=512) :: arg6
   character(len=512) :: arg7
   character(len=512) :: arg8
+  character(len=512) :: arg9
 
   character(len=512) :: orig_tile
   character(len=512) :: new_tile
@@ -46,6 +46,8 @@ program main
   character(len=512) :: f2g_file
   character(len=12 ) :: ymdhm
   character(len=12 ) :: SURFLAY
+  character(len=:), allocatable :: new_r, orig_r
+  integer, allocatable :: int_types(:)
 
   call get_command_argument(1,option)
   call get_command_argument(2,arg1)
@@ -56,6 +58,7 @@ program main
   call get_command_argument(7,arg6)
   call get_command_argument(8,arg7)
   call get_command_argument(9,arg8)
+  call get_command_argument(10,arg9)
 
   if( trim(option) == "c_f2g") then
 
@@ -71,46 +74,56 @@ program main
      SURFLAY         = trim(adjustl(arg7))
      f2g_file        = arg8
 
-     call createf2g(orig_tile,domain_def_file,trim(out_path),catch_def_file,trim(exp_id),ymdhm, SURFLAY, f2g_file)
+     call get_tile_types(trim(arg9), int_types)  
+
+     call create_mapping(orig_tile,domain_def_file,trim(out_path),catch_def_file,trim(exp_id),ymdhm, SURFLAY, f2g_file, int_types)
 
-  else if (trim(option) == "c_localtile") then
+  else if (trim(option) == "zoomin_tile") then
 
      orig_tile  = arg1
      new_tile   = arg2
      f2g_file   = arg3
-     call createLocalTilefile(f2g_file, orig_tile,new_tile)
+     call createZoominTilefile(f2g_file, orig_tile,new_tile)
 
-  else if (trim(option) == "c_localbc" ) then
+  else if (trim(option) == "zoomin_bc" ) then
 
      orig_BC  = arg1
      new_BC   = arg2
      f2g_file = arg3
 
-     call createLocalBC(f2g_file, orig_BC, new_BC)
+     call createZoominBC(f2g_file, orig_BC, new_BC)
 
-  else if (trim(option) == "c_localvegrst") then
+  else if (trim(option) == "zoomin_vegrst") then
 
      orig_veg = arg1
      new_veg  = arg2
      f2g_file = arg3
 
-     call  createLocalVegRestart(f2g_file, orig_veg, new_veg)      
+     call  createZoominVegRestart(f2g_file, orig_veg, new_veg)      
 
-  else if (trim(option) == "c_localmwrtmrst") then
+  else if (trim(option) == "zoomin_mwrtmrst") then
 
      orig_rtm = arg1
      new_rtm  = arg2
      f2g_file = arg3
 
-     call  createLocalmwRTMRestart(f2g_file, orig_rtm, new_rtm)      
+     call  createZoominRestart(f2g_file, orig_rtm, new_rtm, 100)      
 
-  else if (trim(option) == "c_localcatchrst") then
+  else if (trim(option) == "zoomin_catchrst") then
 
      orig_catch = arg1
      new_catch  = arg2
      f2g_file   = arg3
 
-     call createLocalCatchRestart(f2g_file, orig_catch, new_catch)
+     call createZoominRestart(f2g_file, orig_catch, new_catch, 100)
+
+  else if (trim(option) == "zoomin_landicerst") then
+
+     orig_r = trim(arg1)
+     new_r  = trim(arg2)
+     f2g_file   = trim(arg3)
+
+     call createZoominRestart(f2g_file, orig_r, new_r, 20)
 
   else if (trim(option)=="correctease") then
 
@@ -128,15 +141,41 @@ program main
 
   else if (trim(option) == "optimize") then
 
-
-     call optimize_latlon(arg1,arg2, arg3, arg4)
+     call get_tile_types(trim(arg5), int_types) 
+     call optimize_latlon(arg1,arg2, arg3, arg4, int_types)
 
   else
 
      print*, " wrong preprocess option:",option
 
   end if
-
+
+contains
+
+  subroutine get_tile_types(str_types, int_types)
+    character(*), intent(in) :: str_types
+    integer, allocatable, intent(out) :: int_types(:)
+    integer :: n, Length, from, to, i
+    n = 1
+    Length = len(str_types)
+    do i = 1, Length
+      if (str_types(i:i) == '_') n = n+1
+    enddo
+    allocate(int_types(n))
+    from = 0
+    to   = 1
+    n    = 1
+    do while (to <= Length)
+      if (str_types(to:to) == "_") then
+         read (unit=str_types(from+1:to-1),fmt=*) int_types(n)
+         n = n + 1
+         from = to
+      endif
+      to = to + 1
+    enddo
+    read (unit=str_types(from+1:to-1),fmt=*) int_types(n)
+  end subroutine get_tile_types 
+
 end program main
 
 ! ====================== EOF =======================================================