Merge pull request #10 from juliaputko/uvic_ice_jp

added new dimension
PatrickFarnole · Jul 16, 2021 · 6e4d1b8 · 6e4d1b8
2 parents 9dc4846 + 6f099c9
commit 6e4d1b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/extern/flexout b/extern/flexout
diff --git a/extern/stim b/extern/stim
diff --git a/src/gotm/gotm.F90 b/src/gotm/gotm.F90
@@ -60,7 +60,7 @@ module gotm
 
 #ifdef _ICE_
    use ice,         only: init_ice, post_init_ice, do_ice, clean_ice, ice_cover
-   use stim_variables, only: Tice_surface,albedo_ice,transmissivity
+   use stim_variables, only: Tice_surface,albedo_ice,transmissivity, nilay
 #endif
 
    use turbulence,  only: turb_method
@@ -413,6 +413,7 @@ subroutine initialize_gotm()
    call fm%register_dimension('lat',1,id=id_dim_lat)
    call fm%register_dimension('z',nlev,id=id_dim_z)
    call fm%register_dimension('zi',nlev+1,id=id_dim_zi)
+   call fm%register_dimension('zice',nilay+1,id=id_dim_zice) !jpnote
    call fm%register_dimension('time',id=id_dim_time)
    call fm%initialize(prepend_by_default=(/id_dim_lon,id_dim_lat/),append_by_default=(/id_dim_time/))
 
@@ -744,7 +745,7 @@ subroutine integrate_gotm()
 
 #ifdef _ICE_
       Qsw = I_0%value
-      call do_ice(h(nlev),dt,T(nlev),S(nlev),ta,precip%value,Qsw, &
+      call do_ice(h(nlev),dt,T(nlev),S(nlev),ta,precip%value,Qsw, &   !h -- sum of dz ,, T -- temp of water !make sure arrays are not shaped for water  
                   surface_fluxes,julianday,secondsofday,longitude, &
                   latitude,I_0%value,airt%value,airp%value,hum%value, &
                   u10%value,v10%value,cloud%value,rho(nlev),rho_0,ql%method, &  !sst,sss%value, !ql%method == longwave_radiation_method 

diff --git a/src/gotm/register_all_variables.F90 b/src/gotm/register_all_variables.F90
@@ -280,9 +280,9 @@ subroutine register_stim_variables(nlev)
    call fm%register('rhoCp', '10^6 J m-3 K-1', 'volum heat capacity', standard_name='', data0d=ice_uvic_rhoCp(nilay), category='ice')
 
    !Causing error for now  jpnote 
-   !call fm%register('Tice', 'Celsius', 'Ice slab temperature', standard_name='',dimensions=(/id_dim_z/), data1d=ice_uvic_Tice(2:nilay+2), category='ice')
-   !call fm%register('Sint', 'W m-3', 'Ice SW internal heat', standard_name='',dimensions=(/id_dim_z/),data0d=ice_uvic_Sint(nilay+1), category='ice')
-   !call fm%register('Pari', 'W m-2', 'PAR radiation in ice', standard_name='',dimensions=(/id_dim_z/), data0d=ice_uvic_Pari(nilay+1), category='ice')
+   call fm%register('Tice', 'Celsius', 'Ice slab temperature', standard_name='',dimensions=(/id_dim_zice/), data1d=ice_uvic_Tice(0:nilay), category='ice')
+   call fm%register('Sint', 'W m-3', 'Ice SW internal heat', standard_name='',dimensions=(/id_dim_zice/),data1d=ice_uvic_Sint(1:nilay+1), category='ice')
+   call fm%register('Pari', 'W m-2', 'PAR radiation in ice', standard_name='',dimensions=(/id_dim_zice/), data1d=ice_uvic_Pari(1:nilay+1), category='ice')
  !--------------------------------------------------------------------------------------  
 #if 0
 ! public vars
+4 −1		src/field_manager.F90
+1 −1		src/formats/netcdf_output.F90
+3 −4		src/drivers/gotm/gotm_stim.F90
+2 −2		src/models/flato/stim_flato.F90