From 1d04a55025ac1dedbb9c2574bd1185c4f6c4b42a Mon Sep 17 00:00:00 2001 From: Patrick Farnole Date: Wed, 11 Aug 2021 12:22:31 -0700 Subject: [PATCH 1/4] Adding stim --- extern/stim | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extern/stim b/extern/stim index 4a67e03b..d6441f90 160000 --- a/extern/stim +++ b/extern/stim @@ -1 +1 @@ -Subproject commit 4a67e03ba3347fe9a98d077a5ab3d2f15deedd56 +Subproject commit d6441f9008e5fdc1fb735e05c46e26f90b6996c5 From bd28648f8de004ee1147d375acc385947e507cf8 Mon Sep 17 00:00:00 2001 From: Andrew Shao Date: Fri, 20 Aug 2021 16:38:00 +0000 Subject: [PATCH 2/4] Reference Patrick's forks for repository The current .gitmodules references the main forks. Some work that has been recently been completed at UVic however has not yet been merged back into the main gotm repositories. To facillitate the use of the new code, the .gitmodules now references @PatrickFarnole's forks for stim, flexout, and fabm. --- .gitmodules | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/.gitmodules b/.gitmodules index 44e38b7c..1e132023 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,14 +1,12 @@ [submodule "extern/fabm"] path = extern/fabm - url = https://github.com/fabm-model/fabm -# url = ../../fabm-model/fabm + url = https://github.com/PatrickFarnole/fabm [submodule "extern/flexout"] path = extern/flexout - url = https://github.com/BoldingBruggeman/flexout -# url = ../../BoldingBruggeman/flexout + url = https://github.com/PatrickFarnole/flexout [submodule "extern/stim"] path = extern/stim - url = https://github.com/BoldingBruggeman/stim + url = https://github.com/PatrickFarnole/stim [submodule "extern/CVMix-src"] path = extern/CVMix-src url = https://github.com/CVMix/CVMix-src.git From 6d083ed78cf8640a0784bb6bd4317342e66e9bc2 Mon Sep 17 00:00:00 2001 From: Julia Putko Date: Thu, 16 Dec 2021 02:47:24 -0800 Subject: [PATCH 3/4] changes in fabm and stim --- extern/fabm | 2 +- extern/stim | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/extern/fabm b/extern/fabm index 17d5bc97..9e7b2f94 160000 --- a/extern/fabm +++ b/extern/fabm @@ -1 +1 @@ -Subproject commit 17d5bc97fb096f8122b74cd7a6b8158194a6b014 +Subproject commit 9e7b2f94f47b68e1ab5d5b991545e4946eb0b010 diff --git a/extern/stim b/extern/stim index a8d2346f..eb7d7af9 160000 --- a/extern/stim +++ b/extern/stim @@ -1 +1 @@ -Subproject commit a8d2346f08b61012d4ba015eb5a9d3d1a86305df +Subproject commit eb7d7af97dc77c4b124f2ca8de5e69bd8b4c835e From 24689aa99a55634c7840a81347fb423fcda2b9e1 Mon Sep 17 00:00:00 2001 From: Julia Putko Date: Thu, 30 Dec 2021 12:28:20 -0800 Subject: [PATCH 4/4] indentation correction --- src/airsea/airsea.F90 | 12 ++++++------ src/airsea/longwave_radiation.F90 | 16 ++++++++-------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/airsea/airsea.F90 b/src/airsea/airsea.F90 index 406f0d4c..748d87aa 100644 --- a/src/airsea/airsea.F90 +++ b/src/airsea/airsea.F90 @@ -264,7 +264,7 @@ subroutine init_airsea_nml(namlst, fn) REALTYPE :: const_tx,const_ty REALTYPE :: const_precip REALTYPE :: precip_factor - integer :: back_radiation_method + integer :: back_radiation_method integer :: heat_method namelist /airsea/ calc_fluxes, & @@ -498,9 +498,9 @@ subroutine init_airsea_yaml() minimum=0._rk,default=0._rk, extra_options=(/option(3, 'from time, location and cloud cover', 'calculate')/)) call branch%get(ql_, 'longwave_radiation', 'longwave radiation', 'W/m^2', & default=0._rk, method_file=0, method_constant=method_unsupported, & - extra_options=(/option(CLARK, 'Clark et al. (1974)', 'Clark'), option(HASTENRATH_LAMB, 'Hastenrath and Lamb (1978)', 'Hastenrath_Lamb'), option(BIGNAMI, 'Bignami et al. (1995)', 'Bignami'), option(BERLIAND_BERLIAND, 'Berliand and Berliand (1952)', 'Berliand_Berliand'), option(JOSEY1, 'Josey et al. (2003) - 1', 'Josey1'), option(JOSEY2, 'Josey et al. (2003) - 2', 'Josey2')/), default_method=CLARK, pchild=leaf) + extra_options=(/option(CLARK, 'Clark et al. (1974)', 'Clark'), option(HASTENRATH_LAMB, 'Hastenrath and Lamb (1978)', 'Hastenrath_Lamb'), option(BIGNAMI, 'Bignami et al. (1995)', 'Bignami'), option(BERLIAND_BERLIAND, 'Berliand and Berliand (1952)', 'Berliand_Berliand'), option(JOSEY1, 'Josey et al. (2003) - 1', 'Josey1'), option(JOSEY2, 'Josey et al. (2003) - 2', 'Josey2')/), default_method=CLARK, pchild=leaf) call leaf%get(longwave_type, 'type', 'longwave type from file', & - options=(/option(1, 'net longwave radiation'), option(2, 'incoming longwave radiation')/), default=1) + options=(/option(1, 'net longwave radiation'), option(2, 'incoming longwave radiation')/), default=1) twig => branch%get_typed_child('albedo') @@ -696,7 +696,7 @@ subroutine post_init_airsea(lat,lon) LEVEL3 'longwave radiation:' select case (ql_%method) case(0) ! Read from file instead of calculating - call register_input(ql_) + call register_input(ql_) case(CLARK) LEVEL4 'using Clark formulation' case(HASTENRATH_LAMB) @@ -767,7 +767,7 @@ subroutine surface_fluxes_uvic(surface_temp,sensible,latent,longwave_radiation_v call humidity(hum_method,hum%value,airp%value,tw,airt%value) call longwave_radiation(ql_%method,longwave_type, & - dlat,tw_k,ta_k,cloud%value,ql_%value,longwave_radiation_value) + dlat,tw_k,ta_k,cloud%value,ql_%value,longwave_radiation_value) call airsea_fluxes(fluxes_method, & tw,airt%value,u10%value,v10%value,precip%value,evap,tx_%value,ty_%value,latent,sensible) @@ -1020,7 +1020,7 @@ subroutine flux_from_meteo(jul,secs) call humidity(hum_method,hum,airp,tw,ta) call longwave_radiation(ql_%method,longwave_type, & dlat,tw_k,ta_k,cloud,ql_%value,ql) - ! end if + #if 0 call airsea_fluxes(fluxes_method,rain_impact,calc_evaporation, & tw,ta,u10%value-ssu,v10%value-ssv,precip%value,evap,tx2,ty2,qe,qh) diff --git a/src/airsea/longwave_radiation.F90 b/src/airsea/longwave_radiation.F90 index c99cb372..02e96e29 100644 --- a/src/airsea/longwave_radiation.F90 +++ b/src/airsea/longwave_radiation.F90 @@ -68,14 +68,14 @@ subroutine longwave_radiation(method,type,dlat,tw,ta,cloud,qlobs,ql) ccf= cloud_correction_factor(nint(abs(dlat))+1) select case(method) - case(FILE) - select case(type) - case(1) - ql=qlobs - case(2) - ql = qlobs-bolz*emiss*(tw**4) - end select - case(CLARK) + case(FILE) + select case(type) + case(1) + ql=qlobs + case(2) + ql = qlobs-bolz*emiss*(tw**4) + end select + case(CLARK) ! Clark et al. (1974) formula. ! unit of ea is Pascal, must hPa ! Black body defect term, clouds, water vapor correction