Changeset 4368 for LMDZ6/branches/Ocean_skin/libf/dyn3d/conf_gcm.F90

Timestamp:

Dec 6, 2022, 12:01:16 AM (19 months ago)

Author:

lguez

Message:

Sync latest trunk changes to Ocean_skin

Location:

LMDZ6/branches/Ocean_skin

Files:

• . (modified) (1 prop)
• libf/dyn3d/conf_gcm.F90 (modified) (10 diffs)

LMDZ6/branches/Ocean_skin/libf/dyn3d/conf_gcm.F90

@@ -116 +116 @@
   CALL getin('calend', calend)
 ! initialize year_len for aquaplanets and 1D
-      if (calend == 'earth_360d') then
-        year_len=360
-      else if (calend == 'earth_365d') then
-        year_len=365
-      else if (calend == 'earth_366d') then
-        year_len=366
-      else 
-        year_len=1
-      endif
+  IF (calend == 'earth_360d') THEN
+     year_len=360
+  ELSE IF (calend == 'earth_365d') THEN
+     year_len=365
+  ELSE IF (calend == 'earth_366d') THEN
+     year_len=366
+  ELSE 
+     year_len=1
+  ENDIF
 
   !Config  Key  = dayref
@@ -315 +315 @@
   CALL getin('ngroup',ngroup)
 
-
   ! top_bound sponge: only active if ok_strato=.true. and iflag_top_bound!=0
   !                   iflag_top_bound=0 for no sponge
@@ -322 +321 @@
   iflag_top_bound=1
   CALL getin('iflag_top_bound',iflag_top_bound)
+  IF (iflag_top_bound < 0 .or. iflag_top_bound > 2) &
+       call abort_gcm("conf_gcm", 'iflag_top_bound must be 0, 1 or 2', 1)
 
   ! mode_top_bound : fields towards which sponge relaxation will be done:
@@ -394 +395 @@
   !     .........   (  modif  le 17/04/96 )   .........
 
-  test_etatinit: IF (.not. etatinit) then
+  test_etatinit: IF (.not. etatinit) THEN
      !Config  Key  = clon
      !Config  Desc = centre du zoom, longitude
@@ -598 +599 @@
      type_trac = 'lmdz'
      CALL getin('type_trac',type_trac)
-
-     !Config  Key  = config_inca
-     !Config  Desc = Choix de configuration de INCA
-     !Config  Def  = none
-     !Config  Help = Choix de configuration de INCA :
-     !Config         'none' = sans INCA
-     !Config         'chem' = INCA avec calcul de chemie
-     !Config         'aero' = INCA avec calcul des aerosols 
-     config_inca = 'none'
-     CALL getin('config_inca',config_inca)
 
      !Config  Key  = ok_dynzon 
@@ -671 +662 @@
      write(lunout,*)' offline = ', offline
      write(lunout,*)' type_trac = ', type_trac
-     write(lunout,*)' config_inca = ', config_inca
      write(lunout,*)' ok_dynzon = ', ok_dynzon 
      write(lunout,*)' ok_dyn_ins = ', ok_dyn_ins 
      write(lunout,*)' ok_dyn_ave = ', ok_dyn_ave 
-  else
+  ELSE
      !Config  Key  = clon
      !Config  Desc = centre du zoom, longitude
@@ -795 +785 @@
      CALL getin('type_trac',type_trac)
 
-     !Config  Key  = config_inca
-     !Config  Desc = Choix de configuration de INCA
-     !Config  Def  = none
-     !Config  Help = Choix de configuration de INCA :
-     !Config         'none' = sans INCA
-     !Config         'chem' = INCA avec calcul de chemie
-     !Config         'aero' = INCA avec calcul des aerosols 
-     config_inca = 'none'
-     CALL getin('config_inca',config_inca)
-
      !Config  Key  = ok_dynzon 
      !Config  Desc = sortie des transports zonaux dans la dynamique
@@ -875 +855 @@
 
      write(lunout,*)' #########################################'
-     write(lunout,*)' Configuration des parametres de cel0' &
-          //'_limit: '
+     write(lunout,*)' Configuration des parametres de cel0_limit: '
      write(lunout,*)' planet_type = ', planet_type
      write(lunout,*)' calend = ', calend
@@ -912 +891 @@
      write(lunout,*)' offline = ', offline
      write(lunout,*)' type_trac = ', type_trac
-     write(lunout,*)' config_inca = ', config_inca
      write(lunout,*)' ok_dynzon = ', ok_dynzon
      write(lunout,*)' ok_dyn_ins = ', ok_dyn_ins 
@@ -920 +898 @@
      write(lunout,*)' ok_limit = ', ok_limit
      write(lunout,*)' ok_etat0 = ', ok_etat0
+     write(lunout,*)' ok_guide = ', ok_guide
      write(lunout,*)' read_orop = ', read_orop
-  end IF test_etatinit
+  ENDIF test_etatinit
 
 END SUBROUTINE conf_gcm