diff --git a/most.c b/most.c
index c08d46d0fd6cd90dae54cf5998ee7573829c7299..c66b9fc79abd253837d0ed12b6f5468bcf76ed35 100644
--- a/most.c
+++ b/most.c
@@ -342,7 +342,7 @@ int nac;
int Preprocessed;
int SAMindex;
int ScreenHeight;
-int Expert = 1;
+int Expert = 0;
int CatEnabled;
int SamEnabled;
int LsgEnabled;
@@ -618,6 +618,12 @@ void ChangeModel(int NewMo)
if (SelLsg) SelLsg->no = 0;
for (i=0 ; i < PLANETS ; ++i) SelPlanet[i]->no = 0;
}
+ else
+ {
+ SelOce->no = 0;
+ SelIce->no = 0;
+ }
+
}
if (Expert)
{
@@ -1004,17 +1010,22 @@ void InitNamelist(void)
NL_r(PLASIM,"radmod" ,"CO2" ,360.0);
NL_i(PLASIM,"plasim" ,"KICK" , 1);
NL_i(PLASIM,"plasim" ,"MPSTEP" , 0);
- NL_i(PLASIM,"plasim" ,"NAQUA" , 0);
+//FL0318 NL_i(PLASIM,"plasim" ,"NAQUA" , 0);
NL_i(PLASIM,"plasim" ,"NDIAG" , 0);
- NL_i(PLASIM,"plasim" ,"NGUIDBG" , 0);
- NL_i(PLASIM,"plasim" ,"NQSPEC" , 1);
- NL_i(PLASIM,"plasim" ,"NVEG" , 0);
+//FL0318 NL_i(PLASIM,"plasim" ,"NGUIDBG" , 0);
+//FL0318 NL_i(PLASIM,"plasim" ,"NQSPEC" , 1);
+//FL0318 NL_i(PLASIM,"plasim" ,"NVEG" , 0);
NL_i(PLASIM,"plasim" ,"NWPD" , 1);
NL_i(PLASIM,"plasim" ,"NPRINT" , 0);
- NL_i(PLASIM,"plasim" ,"NSYNC" , 1);
- NL_i(PLASIM,"rainmod","NCLOUDS" , 1);
- NL_i(PLASIM,"rainmod","NSTORAIN", 0);
- NL_r(PLASIM,"plasim" ,"SYNCSTR", 0.0);
+//FL0318 NL_i(PLASIM,"plasim" ,"NSYNC" , 1);
+//FL0318 NL_i(PLASIM,"rainmod","NCLOUDS" , 1);
+//FL0318 NL_i(PLASIM,"rainmod","NSTORAIN", 0);
+//FL0318 NL_r(PLASIM,"plasim" ,"SYNCSTR", 0.0);
+ if (Expert)
+ {
+ NL_i(PLASIM,"plasim" ,"NSYNC" , 0);
+ NL_r(PLASIM,"plasim" ,"SYNCSTR", 0.0);
+ }
// SAM
@@ -1511,7 +1522,8 @@ void InitSelections(void)
Sel = NewSel(Sel);
InitNextSelection(Sel,dyn,"Orography");
Sel->type = SEL_CHECK;
- Sel->div = Sel->iv = 1;
+//FL0318 Sel->div = Sel->iv = 1;
+ Sel->div = Sel->iv = 0;
Sel->piv = &noro;
SelOro = Sel;
@@ -1520,7 +1532,8 @@ void InitSelections(void)
Sel = NewSel(Sel);
InitNextSelection(Sel,dyn,"Annual cycle");
Sel->type = SEL_CHECK;
- Sel->div = Sel->iv = 1;
+//FL0318 Sel->div = Sel->iv = 1;
+ Sel->div = Sel->iv = 0;
SelAnn = Sel;
// Experiment
@@ -3378,7 +3391,11 @@ void WriteNamelistFile(char *nl, int instance)
if (!strcmp(nl,"oceanmod"))
{
fprintf(fp," %-12s=%6d\n","NOCEAN",Oce);
- fprintf(fp," %-12s=%6d\n","NLSG" ,Lsg);
+//FL0318
+ if (Lsg)
+ {
+ fprintf(fp," %-12s=%6d\n","NLSG" ,Lsg);
+ }
}
if (!strcmp(nl,"plasim"))
{
@@ -4483,10 +4500,12 @@ void InitGUI(void)
}
}
- xpp = fopen("Beginner","r"); // Expert mode ?
+//FL0318 xpp = fopen("Beginner","r"); // Expert mode ?
+ xpp = fopen("Expert","r"); // Expert mode ?
if (xpp)
{
- Expert = 0;
+//FL0318 Expert = 0;
+ Expert = 1;
fclose(xpp);
}
@@ -4505,7 +4524,8 @@ void InitGUI(void)
}
xpp = fopen("lsg/src/lsgmod.f90","r"); // LSG there ?
- if (xpp)
+//FL0318 if (xpp)
+ if (xpp && Expert)
{
LsgEnabled = 1;
fclose(xpp);
diff --git a/plasim/src/plasim.f90 b/plasim/src/plasim.f90
index d5e9e947db30082104d26d915b159dd2f85fb54d..a3a2aad861f93ba7e1754605c4b5915100d54c14 100644
--- a/plasim/src/plasim.f90
+++ b/plasim/src/plasim.f90
@@ -40,8 +40,9 @@
! tdiss days on every variable at the truncation wavenumber.
!
! UPDATE VERSION IDENTIFIER AFTER EACH CODE CHANGE!
-
-plasimversion = "https://github.com/Edilbert/PLASIM/ : 15-Dec-2015"
+ plasimwww="https://www.mi.uni-hamburg.de/en/arbeitsgruppen" &
+ & //"/theoretische-meteorologie/modelle/plasim.html"
+ plasimversion = "15-Mar-2018"
call mpstart(-1) ! -1: Start MPI >=0 arg = MPI_COMM_WORLD
call setfilenames
@@ -144,7 +145,16 @@ plasimversion = "https://github.com/Edilbert/PLASIM/ : 15-Dec-2015"
call cpu_time(tmstart)
write(nud,'(54("*"))')
write(nud,'("* ",17X,"PLANET SIMULATOR",17X," *")')
- write(nud,'("* ",a50," *")') plasimversion
+ write(nud,'("* ",50X," *")')
+ write(nud,'("* ",a50," *")') "Version: "//plasimversion
+ write(nud,'("* ",a50," *")') "from "//plasimwww(1:45)
+ if(len_trim(plasimwww) > 45) then
+ write(nud,'("* ",a50," *")') " "//plasimwww(46:90)
+ endif
+ if(len_trim(plasimwww) > 90) then
+ write(nud,'("* ",a50," *")') " "//plasimwww(91:)
+ endif
+ write(nud,'("* ",50X," *")')
write(nud,'(54("*"))')
if (mrnum > 1) then
write(nud,'("* Instance ",i3," of ",i3,32x,"*")') &
diff --git a/plasim/src/plasimmod.f90 b/plasim/src/plasimmod.f90
index a2a29ed6fa668127942094dc36697075df84b49d..b7333bab8709be81589d9ec97713481a36fa03dd 100644
--- a/plasim/src/plasimmod.f90
+++ b/plasim/src/plasimmod.f90
@@ -152,7 +152,7 @@
integer :: noutput = 1 ! master switch for output: 0=no output
integer :: nafter = 0 ! write data interval: 0 = once per day
integer :: naqua = 0 ! 1: switch to aqua planet mode
- integer :: nveg = 1 ! 1: run vegetation module
+ integer :: nveg = 0 ! 1: run vegetation module
integer :: ncoeff = 0 ! number of modes to print
integer :: ndiag = 0 ! write diagnostics interval 0 = every 10th. day
integer :: ngui = 0 ! 1: run with GUI
@@ -493,12 +493,13 @@
real :: syncstr = 0.0 ! Coupling strength (0 .. 1)
real :: synctime = 0.0 ! Coupling time [days]
-! **********************************************
-! * version identifier (to be set in puma.f90) *
-! * will be printed in puma sub *prolog* *
-! **********************************************
+! ************************************************************
+! * download page and version identifier (set in plasim.f90) *
+! * will be printed in plasim sub *prolog* *
+! ************************************************************
- character(len=80) :: plasimversion
+ character(len=135):: plasimwww
+ character(len=41) :: plasimversion
! ******************************
! * Planet dependent variables *